ext4: 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 ext4.

Also show this status in /proc/mounts

---

index 87036af..e5d47a7 100644
@@ -154,7 +154,7 @@ journal_dev=devnum	When the external journal device's major/minor numbers

in devnum.

noload Don't load the journal on mounting. Note that
- if the filesystem was not unmounted cleanly,
+norecovery 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.

index fc4a8d8..ea3148b 100644
@@ -902,6 +902,9 @@ static int ext4_show_options(struct seq_file *seq, struct vfsmount *vfs)

	if (test_opt(sb, TRIM))
		seq_puts(seq, ",trim");

+ 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"},

Queued, thanks.

I made a minor change to Documentation/filesystems/ext4.txt to make "norecovery" be the first option, since we seem to be treating it as the canonical option name in ext4_show_options().

- Ted