Skip to contentSkip to conversation

ext3: get rid of the duplicate code on ext3_fill_super

PATCH In review Zhao Hongjiang 2 participants 2 messages Oct 29, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 fs/ext3/super.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
fs/ext3/super.c +0 -3
index 5366393..6e50223 100644
@@ -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

#1 lore raw
Quoted 6 lines · Zhao Hongjiang

From: Zhao Hongjiang <[email protected]>

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

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

Quoted 19 lines
---
 fs/ext3/super.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
fs/ext3/super.c +0 -4
index 5366393..6e50223 100644
@@ -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
Signature · 2 lines
Jan Kara <[email protected]>
SUSE Labs, CR