2012-10-29 07:29:14

by Zhao Hongjiang

Subject: [PATCH] ext3: get rid of the duplicate code on ext3_fill_super

From: Zhao Hongjiang <[email protected]>

Clean the duplicate code on ext3_fill_super cause the bellow
also have it.

Signed-off-by: Zhao Hongjiang <[email protected]>
---
fs/ext3/super.c | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 5366393..6e50223 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -1661,9 +1661,6 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
return -ENOMEM;
}
sb->s_fs_info = sbi;
- sbi->s_mount_opt = 0;
- sbi->s_resuid = make_kuid(&init_user_ns, EXT3_DEF_RESUID);
- sbi->s_resgid = make_kgid(&init_user_ns, EXT3_DEF_RESGID);
sbi->s_sb_block = sb_block;

blocksize = sb_min_blocksize(sb, EXT3_MIN_BLOCK_SIZE);
-- 1.7.1

2012-10-29 10:39:54

by Jan Kara

Subject: Re: [PATCH] ext3: get rid of the duplicate code on ext3_fill_super

On Mon 29-10-12 15:28:07, Zhao Hongjiang wrote:
> From: Zhao Hongjiang <[email protected]>
>
> Clean the duplicate code on ext3_fill_super cause the bellow
> also have it.
>
> Signed-off-by: Zhao Hongjiang <[email protected]>
Thanks. I've merged the patch to my tree with somewhat updated changelog:
Setting s_mount_opt to 0 is unnecessary because we use kzalloc() for sb
allocation. s_resuid and s_resgid are set again few lines below based on
values in on disk superblock.

Honza

> ---
> fs/ext3/super.c | 3 ---
> 1 files changed, 0 insertions(+), 3 deletions(-)
>
> diff --git a/fs/ext3/super.c b/fs/ext3/super.c
> index 5366393..6e50223 100644
> --- a/fs/ext3/super.c
> +++ b/fs/ext3/super.c
> @@ -1661,9 +1661,6 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
> return -ENOMEM;
> }
> sb->s_fs_info = sbi;
> - sbi->s_mount_opt = 0;
> - sbi->s_resuid = make_kuid(&init_user_ns, EXT3_DEF_RESUID);
> - sbi->s_resgid = make_kgid(&init_user_ns, EXT3_DEF_RESGID);
> sbi->s_sb_block = sb_block;
>
> blocksize = sb_min_blocksize(sb, EXT3_MIN_BLOCK_SIZE);
> -- 1.7.1
--
Jan Kara <[email protected]>
SUSE Labs, CR