Commit dee1d3b6 authored by Eric Sandeen's avatar Eric Sandeen Committed by Jan Kara
Browse files

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: default avatarEric Sandeen <sandeen@redhat.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent b9183975

Documentation/filesystems/ext3.txt

+2 −2
Original line number Diff line number Diff line
@@ -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

fs/ext3/super.c

+4 −0
Original line number Diff line number Diff line
@@ -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"},

CRA Git | Maintained and supported by SUSTech CRA and CCSE