Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754430AbXJVHDN (ORCPT ); Mon, 22 Oct 2007 03:03:13 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751548AbXJVHC5 (ORCPT ); Mon, 22 Oct 2007 03:02:57 -0400 Received: from e34.co.us.ibm.com ([32.97.110.152]:48035 "EHLO e34.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752023AbXJVHC4 (ORCPT ); Mon, 22 Oct 2007 03:02:56 -0400 Date: Mon, 22 Oct 2007 12:32:49 +0530 From: Bharata B Rao To: Andrew Morton Cc: Jan Blunck , Andreas Gruenbacher , Christoph Hellwig , viro@zeniv.linux.org.uk, linux-kernel@vger.kernel.org Subject: [PATCH 11/13] Make __d_path() to take a struct path argument Message-ID: <20071022070249.GL6489@in.ibm.com> Reply-To: bharata@linux.vnet.ibm.com References: <20071022065352.GA6489@in.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20071022065352.GA6489@in.ibm.com> User-Agent: Mutt/1.5.13 (2006-08-11) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2029 Lines: 59 From: Andreas Gruenbacher One less argument to __d_path. All callers to __d_path pass the dentry and vfsmount of a struct path to __d_path. Pass the struct path directly, instead. Signed-off-by: Andreas Gruenbacher Signed-off-by: Bharata B Rao Acked-by: Christoph Hellwig --- fs/dcache.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) --- a/fs/dcache.c +++ b/fs/dcache.c @@ -1779,8 +1779,7 @@ shouldnt_be_hashed: * "buflen" should be positive. Caller holds the dcache_lock. */ static char * __d_path( struct dentry *dentry, struct vfsmount *vfsmnt, - struct dentry *root, struct vfsmount *rootmnt, - char *buffer, int buflen) + struct path *root, char *buffer, int buflen) { char * end = buffer+buflen; char * retval; @@ -1805,7 +1804,7 @@ static char * __d_path( struct dentry *d for (;;) { struct dentry * parent; - if (dentry == root && vfsmnt == rootmnt) + if (dentry == root->dentry && vfsmnt == root->mnt) break; if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) { /* Global root? */ @@ -1868,7 +1867,7 @@ char * d_path(struct dentry *dentry, str path_get(¤t->fs->root); read_unlock(¤t->fs->lock); spin_lock(&dcache_lock); - res = __d_path(dentry, vfsmnt, root.dentry, root.mnt, buf, buflen); + res = __d_path(dentry, vfsmnt, &root, buf, buflen); spin_unlock(&dcache_lock); path_put(&root); return res; @@ -1936,8 +1935,7 @@ asmlinkage long sys_getcwd(char __user * unsigned long len; char * cwd; - cwd = __d_path(pwd.dentry, pwd.mnt, root.dentry, root.mnt, - page, PAGE_SIZE); + cwd = __d_path(pwd.dentry, pwd.mnt, &root, page, PAGE_SIZE); spin_unlock(&dcache_lock); error = PTR_ERR(cwd); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/