summaryrefslogtreecommitdiffstats
path: root/mm/shmem.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-30 11:04:14 +0100
committerMark Brown <broonie@linaro.org>2013-08-30 11:04:14 +0100
commitc79c33af8f867e57ad4b84102db7901aee67485a (patch)
treeaa619736b89a143cfc48f9647493c929523a928a /mm/shmem.c
parent1c9a341bbdc14051a4d8c74ea67269786c7d3736 (diff)
parent824ef826f3c4d83d1925a5e351313bfd3e5ca6cb (diff)
downloadlinux-c79c33af8f867e57ad4b84102db7901aee67485a.tar.bz2
Merge remote-tracking branch 'asoc/topic/core' into tmp
Diffstat (limited to 'mm/shmem.c')
-rw-r--r--mm/shmem.c8
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
};
/**