From: Miklos Szeredi <mszeredi@suse.cz>
Date: Thu, 24 Jan 2008 22:13:21 +0000 (-0600)
Subject: mount options: fix jfs
X-Git-Tag: v2.6.25-rc1~1238^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5c5e32ceeb6b64496a1842d5d99e4ac8d20166c4;p=linux-2.6-omap-h63xx.git

mount options: fix jfs

Add iocharset= and errors= options to /proc/mounts for jfs
filesystems.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
---

diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index 314bb4ff1ba..70a14001c98 100644
--- a/fs/jfs/super.c
+++ b/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)