summaryrefslogtreecommitdiffstats
path: root/fs/fat
diff options
context:
space:
mode:
authorOGAWA Hirofumi <hirofumi@mail.parknet.co.jp>2011-04-12 21:08:39 +0900
committerOGAWA Hirofumi <hirofumi@mail.parknet.co.jp>2011-04-12 21:12:50 +0900
commitf68e542f3478147986a9c8958942ec649dc06201 (patch)
tree90b4c8b6a087992a67a15e508b25cc29b14f30fb /fs/fat
parent869f58c0cdba3ae6880ab6113617e62672198773 (diff)
downloadlinux-stable-f68e542f3478147986a9c8958942ec649dc06201.tar.gz
linux-stable-f68e542f3478147986a9c8958942ec649dc06201.tar.bz2
linux-stable-f68e542f3478147986a9c8958942ec649dc06201.zip
fat: Fix statfs->f_namelen
pathconf(, _PC_NAME_MAX) is too small for long Unicode filename on fat. 255 as max filename size on fat is Unicode UTF-16 characters. it's not byte size. https://bugzilla.kernel.org/show_bug.cgi?id=16469 To fix it, this returns "len * NLS_MAX_CHARSET_SIZE" instead. Reported-by: Takumi Asaki <takumi.asaki@nokia.com> Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Diffstat (limited to 'fs/fat')
-rw-r--r--fs/fat/inode.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 7a6c819893f2..cb8d8391ac0b 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -581,7 +581,8 @@ static int fat_statfs(struct dentry *dentry, struct kstatfs *buf)
buf->f_bavail = sbi->free_clusters;
buf->f_fsid.val[0] = (u32)id;
buf->f_fsid.val[1] = (u32)(id >> 32);
- buf->f_namelen = sbi->options.isvfat ? FAT_LFN_LEN : 12;
+ buf->f_namelen =
+ (sbi->options.isvfat ? FAT_LFN_LEN : 12) * NLS_MAX_CHARSET_SIZE;
return 0;
}