Patchwork ext3: force ro mount if ext3_setup_super() fails

login
register
mail settings
Submitter Eric Sandeen
Date May 24, 2012, 5 p.m.
Message ID <4FBE6935.3000301@redhat.com>
Download mbox | patch
Permalink /patch/161165/
State Not Applicable
Headers show

Comments

Eric Sandeen - May 24, 2012, 5 p.m.
If ext3_setup_super() fails i.e. due to a too-high revision,
the error is logged in dmesg but the fs is not mounted RO as
indicated.

Tested by:

# mkfs.ext3 -r 4 /dev/sdb6
# mount /dev/sdb6 /mnt/test
# dmesg | grep "too high"
[164152.114551] EXT3-fs (sdb6): error: revision level too high, forcing read-only mode
# grep sdb6 /proc/mounts
/dev/sdb6 /mnt/test2 ext3 rw,seclabel,relatime,errors=continue,user_xattr,acl,barrier=1,data=ordered 0 0
                          ^^

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---


--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Andreas Dilger - May 24, 2012, 5:41 p.m.
On 2012-05-24, at 11:00 AM, Eric Sandeen wrote:
> If ext3_setup_super() fails i.e. due to a too-high revision,
> the error is logged in dmesg but the fs is not mounted RO as
> indicated.
> 
> Tested by:
> 
> # mkfs.ext3 -r 4 /dev/sdb6
> # mount /dev/sdb6 /mnt/test
> # dmesg | grep "too high"
> [164152.114551] EXT3-fs (sdb6): error: revision level too high, forcing read-only mode
> # grep sdb6 /proc/mounts
> /dev/sdb6 /mnt/test2 ext3 rw,seclabel,relatime,errors=continue,user_xattr,acl,barrier=1,data=ordered 0 0
>                          ^^
> 
> Signed-off-by: Eric Sandeen <sandeen@redhat.com>

Reviewed-by: Andreas Dilger <adilger@whamcloud.com>

> ---
> 
> diff --git a/fs/ext3/super.c b/fs/ext3/super.c
> index cf0b592..fef7af2 100644
> --- a/fs/ext3/super.c
> +++ b/fs/ext3/super.c
> @@ -2043,7 +2043,8 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
> 		goto failed_mount3;
> 	}
> 
> -	ext3_setup_super (sb, es, sb->s_flags & MS_RDONLY);
> +	if (ext3_setup_super(sb, es, sb->s_flags & MS_RDONLY))
> +		sb->s_flags |= MS_RDONLY;

I was wondering if this should be:

	sb->s_flags |= ext3_setup_super(...)

but that might be over-thinking things.

> 	EXT3_SB(sb)->s_mount_state |= EXT3_ORPHAN_FS;
> 	ext3_orphan_cleanup(sb, es);
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html


Cheers, Andreas





--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jan Kara - May 29, 2012, 2:09 p.m.
On Thu 24-05-12 11:41:57, Andreas Dilger wrote:
> On 2012-05-24, at 11:00 AM, Eric Sandeen wrote:
> > If ext3_setup_super() fails i.e. due to a too-high revision,
> > the error is logged in dmesg but the fs is not mounted RO as
> > indicated.
> > 
> > Tested by:
> > 
> > # mkfs.ext3 -r 4 /dev/sdb6
> > # mount /dev/sdb6 /mnt/test
> > # dmesg | grep "too high"
> > [164152.114551] EXT3-fs (sdb6): error: revision level too high, forcing read-only mode
> > # grep sdb6 /proc/mounts
> > /dev/sdb6 /mnt/test2 ext3 rw,seclabel,relatime,errors=continue,user_xattr,acl,barrier=1,data=ordered 0 0
> >                          ^^
> > 
> > Signed-off-by: Eric Sandeen <sandeen@redhat.com>
> 
> Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
  Thanks! Merged to my tree.

									Honza

> > ---
> > 
> > diff --git a/fs/ext3/super.c b/fs/ext3/super.c
> > index cf0b592..fef7af2 100644
> > --- a/fs/ext3/super.c
> > +++ b/fs/ext3/super.c
> > @@ -2043,7 +2043,8 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
> > 		goto failed_mount3;
> > 	}
> > 
> > -	ext3_setup_super (sb, es, sb->s_flags & MS_RDONLY);
> > +	if (ext3_setup_super(sb, es, sb->s_flags & MS_RDONLY))
> > +		sb->s_flags |= MS_RDONLY;
> 
> I was wondering if this should be:
> 
> 	sb->s_flags |= ext3_setup_super(...)
> 
> but that might be over-thinking things.
> 
> > 	EXT3_SB(sb)->s_mount_state |= EXT3_ORPHAN_FS;
> > 	ext3_orphan_cleanup(sb, es);
> > 
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
> 
> Cheers, Andreas
> 
> 
> 
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index cf0b592..fef7af2 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -2043,7 +2043,8 @@  static int ext3_fill_super (struct super_block *sb, void *data, int silent)
 		goto failed_mount3;
 	}
 
-	ext3_setup_super (sb, es, sb->s_flags & MS_RDONLY);
+	if (ext3_setup_super(sb, es, sb->s_flags & MS_RDONLY))
+		sb->s_flags |= MS_RDONLY;
 
 	EXT3_SB(sb)->s_mount_state |= EXT3_ORPHAN_FS;
 	ext3_orphan_cleanup(sb, es);