forked from Minki/linux
dynamic_dname(): drop unused dentry argument
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
568035b01c
commit
0f60d28828
@ -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 : "");
|
||||
}
|
||||
|
||||
|
@ -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);
|
||||
}
|
||||
|
||||
|
@ -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];
|
||||
|
@ -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);
|
||||
}
|
||||
|
||||
|
@ -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);
|
||||
}
|
||||
|
||||
|
@ -287,8 +287,8 @@ static inline unsigned d_count(const struct dentry *dentry)
|
||||
/*
|
||||
* helper function for dentry_operations.d_dname() members
|
||||
*/
|
||||
extern __printf(4, 5)
|
||||
char *dynamic_dname(struct dentry *, char *, int, const char *, ...);
|
||||
extern __printf(3, 4)
|
||||
char *dynamic_dname(char *, int, const char *, ...);
|
||||
|
||||
extern char *__d_path(const struct path *, const struct path *, char *, int);
|
||||
extern char *d_absolute_path(const struct path *, char *, int);
|
||||
|
@ -355,7 +355,7 @@ static const struct super_operations sockfs_ops = {
|
||||
*/
|
||||
static char *sockfs_dname(struct dentry *dentry, char *buffer, int buflen)
|
||||
{
|
||||
return dynamic_dname(dentry, buffer, buflen, "socket:[%lu]",
|
||||
return dynamic_dname(buffer, buflen, "socket:[%lu]",
|
||||
d_inode(dentry)->i_ino);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user