ext3: make "norecovery" an alias for "noload"
PATCH 1/1 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
---
Documentation/filesystems/ext3.txt +0 -0
@@ -33,7 +33,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 this forces
- mount of inconsistent filesystem, which can lead to
+norecovery 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 +0 -0
@@ -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"},Quoted 10 lines · Eric Sandeen
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/mountsSigned-off-by Eric Sandeen <[email protected]>
OK, provided ext4 will have the same change, I'm fine with the patch.
So how is it with ext4?
Honza
Quoted 38 lines
---
Documentation/filesystems/ext3.txt +0
-0@@ -33,7 +33,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 this forces
Documentation/filesystems/ext3.txt +1
-1- mount of inconsistent filesystem, which can lead to +norecovery mount of inconsistent filesystem, which can lead tovarious problems.
data=journal All data are committed into the journal prior to being
fs/ext3/super.c +4
-0@@ -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"},
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Quoted 8 lines · Jan Kara
Quoted 7 lines · Eric Sandeen
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.
Quoted 5 lines
Quoted 3 lines
Also show this status in
/proc/mountsSigned-off-by Eric Sandeen <[email protected]>OK, provided ext4 will have the same change, I'm fine with the patch.
So how is it with ext4?
I did send the same patch for ext4
"[PATCH 2/2] ext4: make "norecovery" an alias for "noload""
Thanks,
-Eric
Quoted 39 lines
Honza
Quoted 38 lines
---
Documentation/filesystems/ext3.txt +0
-0@@ -33,7 +33,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 this forces
Documentation/filesystems/ext3.txt +1
-1- mount of inconsistent filesystem, which can lead to +norecovery mount of inconsistent filesystem, which can lead tovarious problems.
data=journal All data are committed into the journal prior to being
fs/ext3/super.c +4
-0@@ -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"},
Quoted 11 lines · Eric Sandeen
Quoted 10 lines · Jan Kara
Quoted 9 lines · Eric Sandeen
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
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Eric Sandeen <[email protected]>OK, provided ext4 will have the same change, I'm fine with the patch.
So how is it with ext4?I did send the same patch for ext4
"[PATCH 2/2] ext4: make "norecovery" an alias for "noload""
Obviously I'm too lame at googling ;). OK, I've merged the patch tofor_next branch.
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Quoted 8 lines · Jan Kara
Quoted 7 lines · Eric Sandeen
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.
Quoted 5 lines
Quoted 3 lines
Also show this status in
/proc/mountsSigned-off-by Eric Sandeen <[email protected]>OK, provided ext4 will have the same change, I'm fine with the patch.
So how is it with ext4?
Queued for the next merge window. I did slightly change the documentation in Documentation/filesystems/ext4.txt to make "norecovery" be the canonnical option name, since that's what Eric had show up in /proc/mounts. That seems fair, we might as well try to add consistency between different Linux filesystems.
- Ted
Quoted 15 lines · [email protected] wrote:
Quoted 8 lines · Jan Kara
Quoted 7 lines · Eric Sandeen
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.
Quoted 5 lines
Quoted 3 lines
Also show this status in
/proc/mountsSigned-off-by Eric Sandeen <[email protected]>OK, provided ext4 will have the same change, I'm fine with the patch.
So how is it with ext4?
Quoted 7 lines
Queued for the next merge window. I did slightly change the documentation in
Documentation/filesystems/ext4.txtto make "norecovery" be the canonnical option name, since that's what Eric had show up in/proc/mounts. That seems fair, we might as well try to add consistency between different Linux filesystems.- Ted
FWIW, the nilfs folks just added an option to do the same thing, and I steered them towards "norecovery" - we may just get some consistency, yet!
-Eric