summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@redhat.com>2009-11-16 16:50:49 -0600
committerJan Kara <jack@suse.cz>2009-12-10 15:02:52 +0100
commitdee1d3b6270a7cf5cc65c493a2ab4ebaad1a1caf (patch)
treec8de16452f9a70e96456bc4bfdfdf1b4f9e3c404 /fs
parentb918397542388de75bd86c32fbfa820e5d629fa9 (diff)
downloadop-kernel-dev-dee1d3b6270a7cf5cc65c493a2ab4ebaad1a1caf.zip
op-kernel-dev-dee1d3b6270a7cf5cc65c493a2ab4ebaad1a1caf.tar.gz
ext3: make "norecovery" an alias for "noload"
Users on the list recently complained about differences across filesystems w.r.t. how to mount without a journal replay. In the discussion it was noted that xfs's "norecovery" option is perhaps more descriptively accurate than "noload," so let's make that an alias for ext3. Also show this status in /proc/mounts Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs')
-rw-r--r--fs/ext3/super.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index ca3068f..c1d128d 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -636,6 +636,9 @@ static int ext3_show_options(struct seq_file *seq, struct vfsmount *vfs)
if (test_opt(sb, DATA_ERR_ABORT))
seq_puts(seq, ",data_err=abort");
+ if (test_opt(sb, NOLOAD))
+ seq_puts(seq, ",norecovery");
+
ext3_show_quota_options(seq, sb);
return 0;
@@ -818,6 +821,7 @@ static const match_table_t tokens = {
{Opt_reservation, "reservation"},
{Opt_noreservation, "noreservation"},
{Opt_noload, "noload"},
+ {Opt_noload, "norecovery"},
{Opt_nobh, "nobh"},
{Opt_bh, "bh"},
{Opt_commit, "commit=%u"},
OpenPOWER on IntegriCloud