diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-08-18 15:09:26 -0400 |
|---|---|---|
| committer | Zefan Li <lizefan@huawei.com> | 2014-12-01 18:02:21 +0800 |
| commit | f9c3484ebd0a5a4918c50612c8400e4ab91ebf92 (patch) | |
| tree | cebe659d48131e32ff6bbcbc7aab423b27c287e0 /fs | |
| parent | 9b9d7b3078f8f4a8fa4b72aa2abd118602f942f2 (diff) | |
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>
[lizf: Backported to 3.4:
- adjust context
- s/hlist_for_each_entry/list_for_each_entry/]
Signed-off-by: Zefan Li <lizefan@huawei.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/namespace.c | 4 | ||||
| -rw-r--r-- | fs/pnode.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index 4e465397e456..2985879371eb 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -1066,6 +1066,9 @@ void umount_tree(struct mount *mnt, int propagate, struct list_head *kill) for (p = mnt; p; p = next_mnt(p, mnt)) list_move(&p->mnt_hash, &tmp_list); + list_for_each_entry(p, &tmp_list, mnt_hash) + list_del_init(&p->mnt_child); + if (propagate) propagate_umount(&tmp_list); @@ -1076,7 +1079,6 @@ void umount_tree(struct mount *mnt, int propagate, struct list_head *kill) if (p->mnt_ns) __mnt_make_shortterm(p); p->mnt_ns = NULL; - list_del_init(&p->mnt_child); if (mnt_has_parent(p)) { p->mnt_parent->mnt_ghosts++; dentry_reset_mounted(p->mnt_mountpoint); diff --git a/fs/pnode.c b/fs/pnode.c index ab5fa9e1a79a..f61dcb4f994c 100644 --- a/fs/pnode.c +++ b/fs/pnode.c @@ -333,8 +333,10 @@ static void __propagate_umount(struct mount *mnt) * umount the child only if the child has no * other children */ - if (child && list_empty(&child->mnt_mounts)) + if (child && list_empty(&child->mnt_mounts)) { + list_del_init(&child->mnt_child); list_move_tail(&child->mnt_hash, &mnt->mnt_hash); + } } } |