Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 329c97f0 authored by Jan Blunck's avatar Jan Blunck Committed by Linus Torvalds
Browse files

One less parameter 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.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: default avatarAndreas Gruenbacher <agruen@suse.de>
Signed-off-by: default avatarJan Blunck <jblunck@suse.de>
Acked-by: default avatarChristoph Hellwig <hch@infradead.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Neil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ac748a09

fs/dcache.c

+5 −7
Original line number Diff line number Diff line
@@ -1777,8 +1777,7 @@ struct dentry *d_materialise_unique(struct dentry *dentry, struct inode *inode) 
 * "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;
@@ -1803,7 +1802,7 @@ static char * __d_path( struct dentry *dentry, struct vfsmount *vfsmnt, 
	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? */
@@ -1866,7 +1865,7 @@ char * d_path(struct dentry *dentry, struct vfsmount *vfsmnt, 
	path_get(&current->fs->root);

	read_unlock(&current->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;
@@ -1934,8 +1933,7 @@ asmlinkage long sys_getcwd(char __user *buf, unsigned long size) 
		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);