summaryrefslogtreecommitdiffstats
path: root/fs/pnode.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-08-18 15:09:26 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2014-08-30 18:31:41 -0400
commit88b368f27a094277143d8ecd5a056116f6a41520 (patch)
tree70dbec3575942bad615cab61ab9061f2b8228128 /fs/pnode.c
parent52addcf9d6669fa439387610bc65c92fa0980cef (diff)
downloadlinux-88b368f27a094277143d8ecd5a056116f6a41520.tar.bz2
get rid of propagate_umount() mistakenly treating slaves as busy.
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. Cc: stable@vger.kernel.org Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
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 302bf22c4a30..aae331a5d03b 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);
}