From 2db2eb79533c01447987c69831b26765c7bde3bb Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Thu, 24 Jan 2008 16:13:21 -0600 Subject: [PATCH] --- yaml --- r: 76107 b: refs/heads/master c: 5c5e32ceeb6b64496a1842d5d99e4ac8d20166c4 h: refs/heads/master i: 76105: 412de3bcebab844d4dcf75199488236b2292bd3d 76103: 919c94baf73f966fca476cf99a9a20ba80f7ac28 v: v3 --- [refs] | 2 +- trunk/fs/jfs/super.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0d9b5f4d8d76..4cf9855d200a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 967c9ec4ec6178bee42f4231c49a3d7f77627978 +refs/heads/master: 5c5e32ceeb6b64496a1842d5d99e4ac8d20166c4 diff --git a/trunk/fs/jfs/super.c b/trunk/fs/jfs/super.c index 314bb4ff1ba8..70a14001c98f 100644 --- a/trunk/fs/jfs/super.c +++ b/trunk/fs/jfs/super.c @@ -598,6 +598,12 @@ static int jfs_show_options(struct seq_file *seq, struct vfsmount *vfs) seq_printf(seq, ",umask=%03o", sbi->umask); if (sbi->flag & JFS_NOINTEGRITY) seq_puts(seq, ",nointegrity"); + if (sbi->nls_tab) + seq_printf(seq, ",iocharset=%s", sbi->nls_tab->charset); + if (sbi->flag & JFS_ERR_CONTINUE) + seq_printf(seq, ",errors=continue"); + if (sbi->flag & JFS_ERR_PANIC) + seq_printf(seq, ",errors=panic"); #ifdef CONFIG_QUOTA if (sbi->flag & JFS_USRQUOTA)