Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-01 09:41:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] namespace.c: cleanup in mark_mounts_for_expiry()

Browse Source 
This patch simplifies mark_mounts_for_expiry() by using detach_mnt() instead
of duplicating everything it does.

It should be an equivalent transformation except for righting the dput/mntput
order.

Al Viro said: "Looks sane".

Signed-off-by: Miklos Szeredi <miklos@szeredi.hu>
Cc: <viro@parcelfarce.linux.theplanet.co.uk>
Acked-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Miklos Szeredi 2005-07-07 17:57:24 -07:00 committed by Linus Torvalds
parent 1ce88cf466
commit a4d7027861
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fs/namespace.c
View File

@ -880,24 +880,13 @@ void mark_mounts_for_expiry(struct list_head *mounts)
/* check that it is still dead: the count should now be 2 - as
* contributed by the vfsmount parent and the mntget above */
if (atomic_read(&mnt->mnt_count) == 2) {
struct vfsmount *xdmnt;
struct dentry *xdentry;
struct nameidata old_nd;
/* delete from the namespace */
list_del_init(&mnt->mnt_list);
list_del_init(&mnt->mnt_child);
list_del_init(&mnt->mnt_hash);
mnt->mnt_mountpoint->d_mounted--;
xdentry = mnt->mnt_mountpoint;
mnt->mnt_mountpoint = mnt->mnt_root;
xdmnt = mnt->mnt_parent;
mnt->mnt_parent = mnt;
detach_mnt(mnt, &old_nd);
spin_unlock(&vfsmount_lock);
mntput(xdmnt);
dput(xdentry);
path_release(&old_nd);
/* now lay it to rest if this was the last ref on the
* superblock */