diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-25 21:25:38 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-25 21:25:38 +0200 |
| commit | 4d4323ea2dbb506a29260a41b554dfc7de79249e (patch) | |
| tree | c79ad1c770bd8b44f4afd3e5e4b5745bbdd42a6a /mm | |
| parent | Merge tag 'acpi-3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ra... (diff) | |
| parent | VFS: collect_mounts() should return an ERR_PTR (diff) | |
| download | linux-4d4323ea2dbb506a29260a41b554dfc7de79249e.tar.xz linux-4d4323ea2dbb506a29260a41b554dfc7de79249e.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro:
"Assorted fixes from the last week or so"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
VFS: collect_mounts() should return an ERR_PTR
bfs: iget_locked() doesn't return an ERR_PTR
efs: iget_locked() doesn't return an ERR_PTR()
proc: kill the extra proc_readfd_common()->dir_emit_dots()
cope with potentially long ->d_dname() output for shmem/hugetlb
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/shmem.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index 8335dbd3fc35..e43dc555069d 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2909,14 +2909,8 @@ EXPORT_SYMBOL_GPL(shmem_truncate_range); /* common code */ -static char *shmem_dname(struct dentry *dentry, char *buffer, int buflen) -{ - return dynamic_dname(dentry, buffer, buflen, "/%s (deleted)", - dentry->d_name.name); -} - static struct dentry_operations anon_ops = { - .d_dname = shmem_dname + .d_dname = simple_dname }; /** |