| From 726beafb270e939bb40a2729ae848b80d146ddd6 Mon Sep 17 00:00:00 2001 |
| From: Eric Sandeen <sandeen@redhat.com> |
| Date: Thu, 19 Nov 2009 14:28:50 -0500 |
| Subject: [PATCH 72/85] ext4: make "norecovery" an alias for "noload" |
| |
| (cherry picked from commit e3bb52ae2bb9573e84c17b8e3560378d13a5c798) |
| |
| 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: Eric Sandeen <sandeen@redhat.com> |
| Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| --- |
| Documentation/filesystems/ext4.txt | 4 ++-- |
| fs/ext4/super.c | 4 ++++ |
| 2 files changed, 6 insertions(+), 2 deletions(-) |
| |
| --- a/Documentation/filesystems/ext4.txt |
| +++ b/Documentation/filesystems/ext4.txt |
| @@ -153,8 +153,8 @@ journal_dev=devnum When the external jou |
| 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. |
| --- a/fs/ext4/super.c |
| +++ b/fs/ext4/super.c |
| @@ -909,6 +909,9 @@ static int ext4_show_options(struct seq_ |
| 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; |
| @@ -1115,6 +1118,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"}, |
