diff --git a/[refs] b/[refs]
index 7a9f9a36d956..32058d3b9c86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 869f58c0cdba3ae6880ab6113617e62672198773
+refs/heads/master: f68e542f3478147986a9c8958942ec649dc06201
diff --git a/trunk/fs/fat/inode.c b/trunk/fs/fat/inode.c
index 7a6c819893f2..cb8d8391ac0b 100644
--- a/trunk/fs/fat/inode.c
+++ b/trunk/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;
 }