Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3bb52ae authored by Eric Sandeen's avatar Eric Sandeen Committed by Theodore Ts'o
Browse files

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: default avatarEric Sandeen <sandeen@redhat.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 5328e635

Documentation/filesystems/ext4.txt

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

                     	if the filesystem was not unmounted cleanly,

norecovery		Don't load the journal on mounting.  Note that

noload			if the filesystem was not unmounted cleanly,

                     	skipping the journal replay will lead to the

                     	filesystem containing inconsistencies that can

                     	lead to any number of problems.

fs/ext4/super.c

+4 −0
Original line number Diff line number Diff line
@@ -902,6 +902,9 @@ static int ext4_show_options(struct seq_file *seq, struct vfsmount *vfs) 
	if (test_opt(sb, DISCARD))

		seq_puts(seq, ",discard");



	if (test_opt(sb, NOLOAD))

		seq_puts(seq, ",norecovery");



	ext4_show_quota_options(seq, sb);



	return 0;
@@ -1108,6 +1111,7 @@ static const match_table_t tokens = { 
	{Opt_acl, "acl"},

	{Opt_noacl, "noacl"},

	{Opt_noload, "noload"},

	{Opt_noload, "norecovery"},

	{Opt_nobh, "nobh"},

	{Opt_bh, "bh"},

	{Opt_commit, "commit=%u"},