Home » Mailing list archives » linux-kernel » 2007 » October » 22

[PATCH 07/13] Use path_put() in a few places instead of {mnt,d}put()

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Bharata B Rao <bharata@...>
To: Andrew Morton <akpm@...>
Cc: Jan Blunck <jblunck@...>, Andreas Gruenbacher <agruen@...>, Christoph Hellwig <hch@...>, <viro@...>, <linux-kernel@...>
Subject: [PATCH 07/13] Use path_put() in a few places instead of {mnt,d}put()
Date: Monday, October 22, 2007 - 2:59 am

From: Jan Blunck <jblunck@suse.de>

Use path_put() in a few places instead of {mnt,d}put()

Signed-off-by: Jan Blunck <jblunck@suse.de>
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com>
Acked-by: Christoph Hellwig <hch@lst.de>
---
 fs/afs/mntpt.c |    3 +--
 fs/namei.c     |   15 +++++----------
 2 files changed, 6 insertions(+), 12 deletions(-)

--- a/fs/afs/mntpt.c
+++ b/fs/afs/mntpt.c
@@ -235,8 +235,7 @@ static void *afs_mntpt_follow_link(struc
 	err = do_add_mount(newmnt, nd, MNT_SHRINKABLE, &afs_vfsmounts);
 	switch (err) {
 	case 0:
-		dput(nd->path.dentry);
-		mntput(nd->path.mnt);
+		path_put(&nd->path);
 		nd->path.mnt = newmnt;
 		nd->path.dentry = dget(newmnt->mnt_root);
 		schedule_delayed_work(&afs_mntpt_expiry_timer,
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -626,8 +626,7 @@ static __always_inline int __do_follow_l
 		if (dentry->d_inode->i_op->put_link)
 			dentry->d_inode->i_op->put_link(dentry, nd, cookie);
 	}
-	dput(dentry);
-	mntput(path->mnt);
+	path_put(path);
 
 	return error;
 }
@@ -1034,8 +1033,7 @@ static int fastcall link_path_walk(const
 		result = __link_path_walk(name, nd);
 	}
 
-	dput(save.path.dentry);
-	mntput(save.path.mnt);
+	path_put(&save.path);
 
 	return result;
 }
@@ -1057,8 +1055,7 @@ static int __emul_lookup_dentry(const ch
 
 	if (!nd->path.dentry->d_inode ||
 	    S_ISDIR(nd->path.dentry->d_inode->i_mode)) {
-		struct dentry *old_dentry = nd->path.dentry;
-		struct vfsmount *old_mnt = nd->path.mnt;
+		struct path old_path = nd->path;
 		struct qstr last = nd->last;
 		int last_type = nd->last_type;
 		struct fs_struct *fs = current->fs;
@@ -1074,14 +1071,12 @@ static int __emul_lookup_dentry(const ch
 		read_unlock(&fs->lock);
 		if (path_walk(name, nd) == 0) {
 			if (nd->path.dentry->d_inode) {
-				dput(old_dentry);
-				mntput(old_mnt);
+				path_put(&old_path);
 				return 1;
 			}
 			path_put(&nd->path);
 		}
-		nd->path.dentry = old_dentry;
-		nd->path.mnt = old_mnt;
+		nd->path = old_path;
 		nd->last = last;
 		nd->last_type = last_type;
 	}
-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 00/13] Use struct path in struct nameidata, Bharata B Rao, (Mon Oct 22, 2:53 am)
Re: [PATCH 00/13] Use struct path in struct nameidata, Christoph Hellwig, (Mon Oct 22, 9:57 am)
Re: [PATCH 00/13] Use struct path in struct nameidata, Bharata B Rao, (Mon Oct 22, 10:33 pm)
Re: [PATCH 00/13] Use struct path in struct nameidata, Jan Blunck, (Tue Oct 23, 4:43 am)
Re: [PATCH 00/13] Use struct path in struct nameidata, Bharata B Rao, (Tue Oct 23, 11:31 pm)
Re: [PATCH 00/13] Use struct path in struct nameidata, Andrew Morton, (Mon Oct 22, 6:56 pm)
Re: [PATCH 00/13] Use struct path in struct nameidata, Jan Blunck, (Tue Oct 23, 4:39 am)
[PATCH 13/13] Rename {__}d_path() to {__}print_path() and fi..., Bharata B Rao, (Mon Oct 22, 3:04 am)
Re: [PATCH 13/13] Rename {__}d_path() to {__}print_path() an..., Christoph Hellwig, (Mon Oct 22, 6:14 am)
Re: [PATCH 13/13] Rename {__}d_path() to {__}print_path() an..., Andrew Morton, (Mon Oct 22, 6:56 pm)
[PATCH 12/13] Use struct path argument in proc_get_link(), Bharata B Rao, (Mon Oct 22, 3:03 am)
[PATCH 11/13] Make __d_path() to take a struct path argument, Bharata B Rao, (Mon Oct 22, 3:02 am)
[PATCH 10/13] Make set_fs_{root,pwd} take a struct path, Bharata B Rao, (Mon Oct 22, 3:02 am)
[PATCH 09/13] Use struct path in fs_struct, Bharata B Rao, (Mon Oct 22, 3:01 am)
[PATCH 08/13] Introduce path_get(), Bharata B Rao, (Mon Oct 22, 3:00 am)
[PATCH 07/13] Use path_put() in a few places instead of {mnt..., Bharata B Rao, (Mon Oct 22, 2:59 am)
[PATCH 05/13] Embed a struct path into struct nameidata inst..., Bharata B Rao, (Mon Oct 22, 2:58 am)
[PATCH 06/13] Introduce path_put(), Bharata B Rao, (Mon Oct 22, 2:59 am)
[PATCH 04/13] Move struct path into its own header, Bharata B Rao, (Mon Oct 22, 2:57 am)
[PATCH 03/13] Remove path_release_on_umount(), Bharata B Rao, (Mon Oct 22, 2:56 am)
[PATCH 02/13] Don't touch fs_struct in usermodehelper, Bharata B Rao, (Mon Oct 22, 2:55 am)
[PATCH 01/13] Don't touch fs_struct in drivers, Bharata B Rao, (Mon Oct 22, 2:54 am)