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>

diff --git a/Documentation/filesystems/ext3.txt b/Documentation/filesystems/ext3.txt
index 05d5cf1d743f1318ef97e2f47cf06a607ebc0f2c..867c5b50cb42967a40484a6ffb9dae07b74bfe8a 100644 (file)
--- a/Documentation/filesystems/ext3.txt
+++ b/Documentation/filesystems/ext3.txt
@@ -32,8 +32,8 @@ journal_dev=devnum    When the external journal device's major/minor numbers
                        identified through its new major/minor numbers encoded
                        in devnum.
 
-noload                 Don't load the journal on mounting. Note that this forces
-                       mount of inconsistent filesystem, which can lead to
+norecovery             Don't load the journal on mounting. Note that this forces
+noload                 mount of inconsistent filesystem, which can lead to
                        various problems.
 
 data=journal           All data are committed into the journal prior to being

diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index ca3068fd234606ab6ab2cd8bb8b178a23f022945..c1d128d765b6f05b9169cab64c66344b6c310182 100644 (file)
--- 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"},