diff options
| author | Eric Sandeen <sandeen@redhat.com> | 2009-11-16 16:50:49 -0600 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2009-12-10 15:02:52 +0100 |
| commit | dee1d3b6270a7cf5cc65c493a2ab4ebaad1a1caf (patch) | |
| tree | c8de16452f9a70e96456bc4bfdfdf1b4f9e3c404 | |
| parent | b918397542388de75bd86c32fbfa820e5d629fa9 (diff) | |
| download | linux-3.10-dee1d3b6270a7cf5cc65c493a2ab4ebaad1a1caf.tar.gz linux-3.10-dee1d3b6270a7cf5cc65c493a2ab4ebaad1a1caf.tar.bz2 linux-3.10-dee1d3b6270a7cf5cc65c493a2ab4ebaad1a1caf.zip | |
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>
| -rw-r--r-- | Documentation/filesystems/ext3.txt | 4 | ||||
| -rw-r--r-- | fs/ext3/super.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/filesystems/ext3.txt b/Documentation/filesystems/ext3.txt index 05d5cf1d743..867c5b50cb4 100644 --- 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 ca3068fd234..c1d128d765b 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"}, |