From f5662bbe49ab4ae43dadc4b7ceaa79e96203dd9b Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Mon, 17 Dec 2012 16:03:01 -0800 Subject: [PATCH] --- yaml --- r: 346452 b: refs/heads/master c: c6c20372bbb2f70d2757eed0a8d6860884bae11f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/fat/inode.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f6be40b6571c..ad8faa932150 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5b3d5aeaa333850756f41350fed2fc95912b2a4f +refs/heads/master: c6c20372bbb2f70d2757eed0a8d6860884bae11f diff --git a/trunk/fs/fat/inode.c b/trunk/fs/fat/inode.c index 3b733a730952..35806813ea4e 100644 --- a/trunk/fs/fat/inode.c +++ b/trunk/fs/fat/inode.c @@ -726,7 +726,8 @@ static int fat_show_options(struct seq_file *m, struct dentry *root) if (opts->allow_utime) seq_printf(m, ",allow_utime=%04o", opts->allow_utime); if (sbi->nls_disk) - seq_printf(m, ",codepage=%s", sbi->nls_disk->charset); + /* strip "cp" prefix from displayed option */ + seq_printf(m, ",codepage=%s", &sbi->nls_disk->charset[2]); if (isvfat) { if (sbi->nls_io) seq_printf(m, ",iocharset=%s", sbi->nls_io->charset);