diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-26 12:47:19 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-26 12:47:19 +0100 |
| commit | 9c9a23470dc44b51230c35b93d1930e2dc2d1000 (patch) | |
| tree | af96ebd819d3ce7013d65d3d45c39e5ce4a96489 /mm | |
| parent | 93570f4be17a7a1d420b79e8a05fb5fe0b452297 (diff) | |
| parent | 14e9c7db465387ede7f019c42f28c90f99fc2793 (diff) | |
Merge tag 'v3.10.17' into linux-linaro-lsk
This is the 3.10.17 stable release
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 5e6a8422658..509b393ecee 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2879,14 +2879,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 }; /** |