Skip to contentSkip to conversation

ext3: don't update sb journal_devnum when RO dev

PATCH In review Maciej Żenczykowski 2 participants 4 messages Sep 26, 2010 – Nov 8, 2010 ext4 file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ext3: don't update sb journal_devnum when RO dev

An ext3 filesystem on a read-only device, with an external journal which is at a different device number then recorded in the superblock will fail to honor the read-only setting of the device and trigger a superblock update (write).

For example:
- ext3 on a software raid which is in read-only mode
- external journal on a read-write device which has changed device num
- attempt to mount with -o journal_dev=<new_number>
- hits BUG_ON(mddev->ro = 1) in md.c

---
 fs/ext3/super.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
fs/ext3/super.c +1 -1
index 5dbf4db..19dfbe9 100644
@@ -2299,7 +2299,7 @@ static int ext3_load_journal(struct super_block *sb,
 	EXT3_SB(sb)->s_journal = journal;
 	ext3_clear_journal_err(sb, es);
 
-	if (journal_devnum &&
+	if (!really_read_only && journal_devnum &&
 	    journal_devnum != le32_to_cpu(es->s_journal_dev)) {
 		es->s_journal_dev = cpu_to_le32(journal_devnum);
 
Signature · 6 lines
1.7.2.3

--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#1 lore raw

PATCH 2/2 ext4: don't update sb journal_devnum when RO dev

An ext4 filesystem on a read-only device, with an external journal which is at a different device number then recorded in the superblock will fail to honor the read-only setting of the device and trigger a superblock update (write).

For example:
- ext4 on a software raid which is in read-only mode
- external journal on a read-write device which has changed device num
- attempt to mount with -o journal_dev=<new_number>
- hits BUG_ON(mddev->ro = 1) in md.c

---
 fs/ext4/super.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
fs/ext4/super.c +1 -1
index 2614774..48388c7 100644
@@ -3470,7 +3470,7 @@ static int ext4_load_journal(struct super_block *sb,
 	EXT4_SB(sb)->s_journal = journal;
 	ext4_clear_journal_err(sb, es);
 
-	if (journal_devnum &&
+	if (!really_read_only && journal_devnum &&
 	    journal_devnum != le32_to_cpu(es->s_journal_dev)) {
 		es->s_journal_dev = cpu_to_le32(journal_devnum);
 
Signature · 6 lines
1.7.2.3

--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#2 lore raw
In reply to Maciej Żenczykowski

2010/9/26 Maciej Żenczykowski <[email protected]>:

Quoted 31 lines

An ext3 filesystem on a read-only device, with an external journal which is at a different device number then recorded in the superblock will fail to honor the read-only setting of the device and trigger a superblock update (write).

For example:
 - ext3 on a software raid which is in read-only mode
 - external journal on a read-write device which has changed device num
 - attempt to mount with -o journal_dev=<new_number>
 - hits BUG_ON(mddev->ro = 1) in md.c

---
 fs/ext3/super.c |    2 +-

 1 files changed, 1 insertions(+), 1 deletions(-)
fs/ext3/super.c +1 -2
index 5dbf4db..19dfbe9 100644
@@ -2299,7 +2299,7 @@ static int ext3_load_journal(struct super_block *sb,
        EXT3_SB(sb)->s_journal = journal;
        ext3_clear_journal_err(sb, es);
 
-       if (journal_devnum &&
+       if (!really_read_only && journal_devnum &&
            journal_devnum != le32_to_cpu(es->s_journal_dev)) {
                es->s_journal_dev = cpu_to_le32(journal_devnum);
 
--
Quoted 3 lines

1.7.2.3

While I can see the ext4 patch at:

http://git.kernel.org/?p=linux/kernel/git/tytso/ext4.git;a=shortlog

I can't find the ext3 patch. Did it get missed?

Maciej
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

reviewer
#3 lore raw
Quoted 38 lines · Maciej Żenczykowski

2010/9/26 Maciej Żenczykowski <[email protected]>:

Quoted 31 lines

An ext3 filesystem on a read-only device, with an external journal which is at a different device number then recorded in the superblock will fail to honor the read-only setting of the device and trigger a superblock update (write).

For example:
 - ext3 on a software raid which is in read-only mode
 - external journal on a read-write device which has changed device num
 - attempt to mount with -o journal_dev=<new_number>
 - hits BUG_ON(mddev->ro = 1) in md.c

---
 fs/ext3/super.c |    2 +-

 1 files changed, 1 insertions(+), 1 deletions(-)
fs/ext3/super.c +1 -2
index 5dbf4db..19dfbe9 100644
@@ -2299,7 +2299,7 @@ static int ext3_load_journal(struct super_block *sb,
        EXT3_SB(sb)->s_journal = journal;
        ext3_clear_journal_err(sb, es);
 
-       if (journal_devnum &&
+       if (!really_read_only && journal_devnum &&
            journal_devnum != le32_to_cpu(es->s_journal_dev)) {
                es->s_journal_dev = cpu_to_le32(journal_devnum);
 
--
Quoted 3 lines

1.7.2.3

While I can see the ext4 patch at:

Quoted 3 lines

http://git.kernel.org/?p=linux/kernel/git/tytso/ext4.git;a=shortlog

I can't find the ext3 patch. Did it get missed?

Yes, it seems so. I'm taking care of ext3 so please CC me directly for
ext3 fixes. Thanks! I'll merge this fix.

Honza

Signature · 6 lines
Jan Kara <[email protected]>
SUSE Labs, CR
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html