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

[sfrench/cifs-2.6.git] / drivers / dma-buf / dma-buf.c

diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
index 1b1c1c002b8df6e8e1b59345c46762a528abced2..dd0f83ee505b7f34efec89fae1f06c176ce85213 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 : "");
 }