diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-07 02:55:41 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-07 02:55:41 +0300 |
| commit | 70df64d6c6c2f76be47311fa6630d6edbefa711e (patch) | |
| tree | 3c031250f622b2bdd47d896acdd16f7cf28c9e55 /drivers | |
| parent | 46811b5cb369fe638665b805f3c84683f78e5379 (diff) | |
| parent | c4c8451147da569a79eff5edcd2864e8ee21d7aa (diff) | |
| download | linux-70df64d6c6c2f76be47311fa6630d6edbefa711e.tar.xz | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dma-buf/dma-buf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index efb4990b29e1..5ec2f314b6e9 100644 --- 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 : ""); } |