2 files changed, 6 insertions, 2 deletions

diff --git a/Documentation/filesystems/ext4.txt b/Documentation/filesystems/ext4.txt
index 26904ff6d61b..af6885c3c821 100644
--- a/Documentation/filesystems/ext4.txt
+++ b/Documentation/filesystems/ext4.txt
@@ -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.
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 2b382f6f80c1..5a2db612950b 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -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"},