diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2014-12-22 19:12:07 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-06 22:03:51 +0200 |
| commit | 7a9742a65c02e30a62ae42c765eb4dff26b51cc9 (patch) | |
| tree | 96bfe612f8b2eb6edcb2b91d95a2303f5055d289 /fs/pnode.c | |
| parent | 7052e71b2d085f76800115d4a212dcaf82b86262 (diff) | |
mnt: Delay removal from the mount hash.
commit 411a938b5abc9cb126c41cccf5975ae464fe0f3e upstream.
- Modify __lookup_mnt_hash_last to ignore mounts that have MNT_UMOUNTED set.
- Don't remove mounts from the mount hash table in propogate_umount
- Don't remove mounts from the mount hash table in umount_tree before
the entire list of mounts to be umounted is selected.
- Remove mounts from the mount hash table as the last thing that
happens in the case where a mount has a parent in umount_tree.
Mounts without parents are not hashed (by definition).
This paves the way for delaying removal from the mount hash table even
farther and fixing the MNT_LOCKED vs MNT_DETACH issue.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/pnode.c')
| -rw-r--r-- | fs/pnode.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/pnode.c b/fs/pnode.c index ac3aa0d43b90..c27ae38ee250 100644 --- a/fs/pnode.c +++ b/fs/pnode.c @@ -383,7 +383,6 @@ static void __propagate_umount(struct mount *mnt) */ if (child && list_empty(&child->mnt_mounts)) { list_del_init(&child->mnt_child); - hlist_del_init_rcu(&child->mnt_hash); child->mnt.mnt_flags |= MNT_UMOUNT; list_move_tail(&child->mnt_list, &mnt->mnt_list); } |