dynamic_dname(): drop unused dentry argument

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
index efb4990b29e105c7df61b6267ebe9abdd4ba60ac..5ec2f314b6e9e4d0c2b184644dcf3c67f13ee65a 100644 (file)
--- a/drivers/dma-buf/dma-buf.c
+++ b/drivers/dma-buf/dma-buf.c
@@ -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 : "");
 }
 

diff --git a/fs/anon_inodes.c b/fs/anon_inodes.c
index e0c3e33c4177b909551be06137e77c46ef5fa5fd..24192a7667edf766e6932e12459c93379875e7e5 100644 (file)
--- a/fs/anon_inodes.c
+++ b/fs/anon_inodes.c
@@ -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);
 }
 

diff --git a/fs/d_path.c b/fs/d_path.c
index e4e0ebad1f1538e1a0d0b3f4f8431ffb5e6b7168..ce8d9d49e1e75201871e74b98a84061b50622177 100644 (file)
--- a/fs/d_path.c
+++ b/fs/d_path.c
@@ -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];

diff --git a/fs/nsfs.c b/fs/nsfs.c
index 800c1d0eb0d026e40604e465df209cc11051e79f..3506f6074288a776619a6efc290330db3a5cc36a 100644 (file)
--- a/fs/nsfs.c
+++ b/fs/nsfs.c
@@ -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);
 }
 

diff --git a/fs/pipe.c b/fs/pipe.c
index 74ae9fafd25a145de0a1377a2c73940e7a404722..42c7ff41c2dba2904cf6c8f2d10ea6984a402823 100644 (file)
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -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);
 }
 

diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index 92c78ed02b54d5bf59c9f5c7506dcf0c6afc1512..54d46518c4810ed223cc9c0d553064ff51387a45 100644 (file)
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -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);

diff --git a/net/socket.c b/net/socket.c
index 9b27c5e4e5ba829c2fc31a74e3b38aa2c0b006a1..d183e83e0cdf8e250ccffa3818597070bf89d945 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -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);
 }