diff options
author | Shannon Zhao <shannon.zhao@linaro.org> | 2015-08-03 20:34:58 +0800 |
---|---|---|
committer | Shannon Zhao <shannon.zhao@linaro.org> | 2015-08-03 20:56:44 +0800 |
commit | 863394fce1f2be8589396cd0684e6693ec89f295 (patch) | |
tree | 547d41fb7d28499738a4307790e9c45d1e082c68 /fs/dcache.c | |
parent | da7f8081816a2adca24faba98b4b7659e6dc2712 (diff) | |
parent | 3cdf91941d7490ba1d0a72729a667c42b489b23a (diff) |
Merge tag 'v3.14.48' of git://git./linux/kernel/git/stable/linux-stable into linux-linaro-lsk-v3.14
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Conflicts:
include/kvm/arm_vgic.h
virt/kvm/arm/vgic.c
virt/kvm/arm/vgic-v2.c
virt/kvm/arm/vgic-v3.c
Diffstat (limited to 'fs/dcache.c')
-rw-r--r-- | fs/dcache.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index d3c2fedada14..87cf545feeeb 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -2937,17 +2937,6 @@ restart: vfsmnt = &mnt->mnt; continue; } - /* - * Filesystems needing to implement special "root names" - * should do so with ->d_dname() - */ - if (IS_ROOT(dentry) && - (dentry->d_name.len != 1 || - dentry->d_name.name[0] != '/')) { - WARN(1, "Root dentry has weird name <%.*s>\n", - (int) dentry->d_name.len, - dentry->d_name.name); - } if (!error) error = is_mounted(vfsmnt) ? 1 : 2; break; |