diff options
| author | Grant Likely <grant.likely@linaro.org> | 2013-08-28 21:18:13 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2013-08-28 21:18:13 +0200 |
| commit | 8be137f2664f0abb096626a9d2ce0fcdd955b109 (patch) | |
| tree | 2c53a5535265a58eb397d6fbbab2ec26e92e6931 /fs/dcache.c | |
| parent | include: dt-binding: input: create a DT header defining key codes. (diff) | |
| parent | Linux 3.11-rc7 (diff) | |
| download | linux-8be137f2664f0abb096626a9d2ce0fcdd955b109.tar.xz linux-8be137f2664f0abb096626a9d2ce0fcdd955b109.zip | |
Merge tag 'v3.11-rc7' into devicetree/next
Linux 3.11-rc7
Diffstat (limited to 'fs/dcache.c')
| -rw-r--r-- | fs/dcache.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index 87bdb5329c3c..83cfb834db03 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -2724,6 +2724,17 @@ char *dynamic_dname(struct dentry *dentry, char *buffer, int buflen, return memcpy(buffer, temp, sz); } +char *simple_dname(struct dentry *dentry, char *buffer, int buflen) +{ + char *end = buffer + buflen; + /* these dentries are never renamed, so d_lock is not needed */ + if (prepend(&end, &buflen, " (deleted)", 11) || + prepend_name(&end, &buflen, &dentry->d_name) || + prepend(&end, &buflen, "/", 1)) + end = ERR_PTR(-ENAMETOOLONG); + return end; +} + /* * Write full pathname from the root of the filesystem into the buffer. */ |