aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@redhat.com>2009-11-16 17:50:49 -0500
committerJan Kara <jack@suse.cz>2009-12-10 09:02:52 -0500
commitdee1d3b6270a7cf5cc65c493a2ab4ebaad1a1caf (patch)
treec8de16452f9a70e96456bc4bfdfdf1b4f9e3c404 /fs
parentb918397542388de75bd86c32fbfa820e5d629fa9 (diff)
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 ca3068fd2346..c1d128d765b6 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)
636 if (test_opt(sb, DATA_ERR_ABORT)) 636 if (test_opt(sb, DATA_ERR_ABORT))
637 seq_puts(seq, ",data_err=abort"); 637 seq_puts(seq, ",data_err=abort");
638 638
639 if (test_opt(sb, NOLOAD))
640 seq_puts(seq, ",norecovery");
641
639 ext3_show_quota_options(seq, sb); 642 ext3_show_quota_options(seq, sb);
640 643
641 return 0; 644 return 0;
@@ -818,6 +821,7 @@ static const match_table_t tokens = {
818 {Opt_reservation, "reservation"}, 821 {Opt_reservation, "reservation"},
819 {Opt_noreservation, "noreservation"}, 822 {Opt_noreservation, "noreservation"},
820 {Opt_noload, "noload"}, 823 {Opt_noload, "noload"},
824 {Opt_noload, "norecovery"},
821 {Opt_nobh, "nobh"}, 825 {Opt_nobh, "nobh"},
822 {Opt_bh, "bh"}, 826 {Opt_bh, "bh"},
823 {Opt_commit, "commit=%u"}, 827 {Opt_commit, "commit=%u"},