summaryrefslogtreecommitdiff
path: root/fs/pnode.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-08-18 15:09:26 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-17 09:19:22 -0700
commitc532b9ce36b10a5b34def0870f5bd7dafc4b1384 (patch)
treec8d12d90719a264e1cdfe04c73e0566db1d1b3c7 /fs/pnode.c
parent93927a247ca105482a9dbaf58a739c5db2546990 (diff)
downloadlwn-c532b9ce36b10a5b34def0870f5bd7dafc4b1384.tar.gz
lwn-c532b9ce36b10a5b34def0870f5bd7dafc4b1384.zip
get rid of propagate_umount() mistakenly treating slaves as busy.
commit 88b368f27a094277143d8ecd5a056116f6a41520 upstream. The check in __propagate_umount() ("has somebody explicitly mounted something on that slave?") is done *before* taking the already doomed victims out of the child lists. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/pnode.c')
-rw-r--r--fs/pnode.c1
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);
}