fs/fat: strip "cp" prefix from codepage in display

Option parsing code expects an unsigned integer for the codepage option,
but prefixes and stores this option with "cp" before passing to
load_nls().  This makes the displayed option in /proc an invalid one.
Strip the prefix when printing so that the displayed option is valid for
reuse.

Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Acked-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 3b733a730952dcc23439afa8a5e5189c93414313..35806813ea4ee3bb425795c52c0719f64979203a 100644 (file)
--- a/fs/fat/inode.c
+++ b/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);