GFS2: Set s_mode before parsing mount options
PATCH 1/1 GFS2: Set s_mode before parsing mount options
In the generic mount_bdev() function, deactivate_locked_super() is called after the fill_super() call fails, at which point s_mode has been set. kill_block_super() expects this and dumps a warning when FMODE_EXCL is not set in s_mode.
In gfs2_mount() we call deactivate_locked_super() on failure of gfs2_mount_args(), at which point s_mode has not yet been set. This causes kill_block_super() to dump a stack trace when gfs2 fails to mount with invalid options. Set s_mode earlier in gfs2_mount() to avoid that.
--- fs/gfs2/ops_fstype.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/gfs2/ops_fstype.c +3 -1
@@ -1291,6 +1291,9 @@ static struct dentry *gfs2_mount(struct file_system_type *fs_type, int flags,up_write (&s->s_umount);blkdev_put (bdev, mode);down_write (&s->s_umount); + }else { +/* s_mode must be set before deactivate_locked_super calls */ + s->s_mode = mode; }memset (&args,0 ,sizeof (args));
@@ -1314,7 +1317,6 @@ static struct dentry *gfs2_mount(struct file_system_type *fs_type, int flags, }else {char b[BDEVNAME_SIZE ]; - s->s_mode = mode;strlcpy (s->s_id,bdevname (bdev, b),sizeof (s->s_id));sb_set_blocksize (s,block_size (bdev)); error =fill_super (s, &args, flags &MS_SILENT ?1 :0 );
Signature · 1 line
2.4.3
PATCH 1/1 GFS2: Set s_mode before parsing mount options
----- Original Message -----
Quoted 38 lines
In the generic
mount_bdev()function,deactivate_locked_super()is called after thefill_super()call fails, at which points_modehas been set.kill_block_super()expects this and dumps a warning whenFMODE_EXCLis not set ins_mode.In
gfs2_mount()we calldeactivate_locked_super()on failure ofgfs2_mount_args(), at which points_modehas not yet been set. This causeskill_block_super()to dump a stack trace when gfs2 fails to mount with invalid options. Sets_modeearlier ingfs2_mount()to avoid that.Signed-off-by Andrew Price <[email protected]>--- fs/gfs2/ops_fstype.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)fs/gfs2/ops_fstype.c +3
-0@@ -1291,6 +1291,9 @@ static struct dentry *gfs2_mount(struct file_system_type *fs_type, int flags, up_write(&s->s_umount);blkdev_put (bdev, mode);down_write (&s->s_umount); + }else { +/* s_mode must be set before deactivate_locked_super calls */ + s->s_mode = mode; }fs/gfs2/ops_fstype.c +0
-1memset (&args,0 ,sizeof (args));@@ -1314,7 +1317,6 @@ static struct dentry *gfs2_mount(struct file_system_type *fs_type, int flags, } else { char b[BDEVNAME_SIZE]; - s->s_mode = mode;strlcpy (s->s_id,bdevname (bdev, b),sizeof (s->s_id));sb_set_blocksize (s,block_size (bdev));
Quoted 4 lines
error =
fill_super(s, &args, flags & MS_SILENT ? 1 : 0);
--
2.4.3
Hi,
Thanks. This is now applied to the for-next branch of the linux-gfs2 tree:
Regards,
Bob Peterson
Red Hat File Systems