diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2014-08-18 21:09:26 +0200 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-08-31 00:31:41 +0200 |
commit | 88b368f27a094277143d8ecd5a056116f6a41520 (patch) | |
tree | 70dbec3575942bad615cab61ab9061f2b8228128 /fs/pnode.c | |
parent | Linux 3.17-rc2 (diff) | |
download | linux-88b368f27a094277143d8ecd5a056116f6a41520.tar.xz linux-88b368f27a094277143d8ecd5a056116f6a41520.zip |
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.c | 1 |
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); } |