diff options
author | Mark Brown <broonie@kernel.org> | 2014-09-17 11:19:07 -0700 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-09-17 11:19:07 -0700 |
commit | 72df321f602520b6ea09f47a71b6795efc0a83c8 (patch) | |
tree | e32e2d9dff3d90f49e95f0bfa61860eac0dc3ed3 /fs/pnode.c | |
parent | 1414ffefd32b80f827a697505a9eede86978ebbb (diff) | |
parent | 0111d0f13469831266d716e3b50d580a3e25cff9 (diff) |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-rtlsk-v3.14-rt-14.09
Diffstat (limited to 'fs/pnode.c')
-rw-r--r-- | fs/pnode.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/pnode.c b/fs/pnode.c index a364a704333b..b7f831089500 100644 --- a/fs/pnode.c +++ b/fs/pnode.c @@ -381,6 +381,7 @@ static void __propagate_umount(struct mount *mnt) * other children */ if (child && list_empty(&child->mnt_mounts)) { + list_del_init(&child->mnt_child); hlist_del_init_rcu(&child->mnt_hash); hlist_add_before_rcu(&child->mnt_hash, &mnt->mnt_hash); } |