diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-08-30 12:35:49 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-08-30 12:35:49 +0200 |
commit | 3fd8a8041b3775840c8f85b6338b61beb5057160 (patch) | |
tree | 2eb4fd3eae3168ae2837c4f98188fd25f62d5939 /fs/hugetlbfs/inode.c | |
parent | 1c9a341bbdc14051a4d8c74ea67269786c7d3736 (diff) | |
parent | 6d52825fd4e78b251f4844f6662a3bc4e31671c7 (diff) |
Merge tag 'asoc-v3.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.12
A few more updates for v3.12, mostly small cleanups plus the addition of
the DT bindings for kirkwood and the new i.MX S/PDIF driver.
Diffstat (limited to 'fs/hugetlbfs/inode.c')
-rw-r--r-- | fs/hugetlbfs/inode.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index 34423978b170..d19b30ababf1 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -926,14 +926,8 @@ static int get_hstate_idx(int page_size_log) return h - hstates; } -static char *hugetlb_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 = hugetlb_dname + .d_dname = simple_dname }; /* |