ext4: make "norecovery" an alias for "noload"

Users on the linux-ext4 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 ext4.

Also show this status in /proc/mounts

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
Eric Sandeen 2009-11-19 14:28:50 -05:00 committed by Theodore Ts'o
parent 5328e63531
commit e3bb52ae2b
2 changed files with 6 additions and 2 deletions

View file

@ -153,8 +153,8 @@ journal_dev=devnum When the external journal device's major/minor numbers
identified through its new major/minor numbers encoded identified through its new major/minor numbers encoded
in devnum. in devnum.
noload Don't load the journal on mounting. Note that norecovery Don't load the journal on mounting. Note that
if the filesystem was not unmounted cleanly, noload if the filesystem was not unmounted cleanly,
skipping the journal replay will lead to the skipping the journal replay will lead to the
filesystem containing inconsistencies that can filesystem containing inconsistencies that can
lead to any number of problems. lead to any number of problems.

View file

@ -902,6 +902,9 @@ static int ext4_show_options(struct seq_file *seq, struct vfsmount *vfs)
if (test_opt(sb, DISCARD)) if (test_opt(sb, DISCARD))
seq_puts(seq, ",discard"); seq_puts(seq, ",discard");
if (test_opt(sb, NOLOAD))
seq_puts(seq, ",norecovery");
ext4_show_quota_options(seq, sb); ext4_show_quota_options(seq, sb);
return 0; return 0;
@ -1108,6 +1111,7 @@ static const match_table_t tokens = {
{Opt_acl, "acl"}, {Opt_acl, "acl"},
{Opt_noacl, "noacl"}, {Opt_noacl, "noacl"},
{Opt_noload, "noload"}, {Opt_noload, "noload"},
{Opt_noload, "norecovery"},
{Opt_nobh, "nobh"}, {Opt_nobh, "nobh"},
{Opt_bh, "bh"}, {Opt_bh, "bh"},
{Opt_commit, "commit=%u"}, {Opt_commit, "commit=%u"},