Commit 70df64d6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pull-d_path' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull vfs d_path updates from Al Viro.

* tag 'pull-d_path' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  d_path.c: typo fix...
  dynamic_dname(): drop unused dentry argument
parents 46811b5c c4c84511

drivers/dma-buf/dma-buf.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static char *dmabuffs_dname(struct dentry *dentry, char *buffer, int buflen) 
		ret = strlcpy(name, dmabuf->name, DMA_BUF_NAME_LEN);

	spin_unlock(&dmabuf->name_lock);



	return dynamic_dname(dentry, buffer, buflen, "/%s:%s",

	return dynamic_dname(buffer, buflen, "/%s:%s",

			     dentry->d_name.name, ret > 0 ? name : "");

}

fs/anon_inodes.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ static struct inode *anon_inode_inode; 
 */

static char *anon_inodefs_dname(struct dentry *dentry, char *buffer, int buflen)

{

	return dynamic_dname(dentry, buffer, buflen, "anon_inode:%s",

	return dynamic_dname(buffer, buflen, "anon_inode:%s",

				dentry->d_name.name);

}

fs/d_path.c

+2 −3
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static bool prepend_char(struct prepend_buffer *p, unsigned char c) 
}



/*

 * The source of the prepend data can be an optimistoc load

 * The source of the prepend data can be an optimistic load

 * of a dentry name and length. And because we don't hold any

 * locks, the length and the pointer to the name may not be

 * in sync if a concurrent rename happens, and the kernel
@@ -297,8 +297,7 @@ EXPORT_SYMBOL(d_path); 
/*

 * Helper function for dentry_operations.d_dname() members

 */

char *dynamic_dname(struct dentry *dentry, char *buffer, int buflen,

			const char *fmt, ...)

char *dynamic_dname(char *buffer, int buflen, const char *fmt, ...)

{

	va_list args;

	char temp[64];

fs/nsfs.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ static char *ns_dname(struct dentry *dentry, char *buffer, int buflen) 
	struct inode *inode = d_inode(dentry);

	const struct proc_ns_operations *ns_ops = dentry->d_fsdata;



	return dynamic_dname(dentry, buffer, buflen, "%s:[%lu]",

	return dynamic_dname(buffer, buflen, "%s:[%lu]",

		ns_ops->name, inode->i_ino);

}

fs/pipe.c

+1 −1
Original line number Diff line number Diff line
@@ -860,7 +860,7 @@ static struct vfsmount *pipe_mnt __read_mostly; 
 */

static char *pipefs_dname(struct dentry *dentry, char *buffer, int buflen)

{

	return dynamic_dname(dentry, buffer, buflen, "pipe:[%lu]",

	return dynamic_dname(buffer, buflen, "pipe:[%lu]",

				d_inode(dentry)->i_ino);

}