| Message ID | 1340815784-6028-1-git-send-email-gaowanlong@cn.fujitsu.com |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Thu 28-06-12 00:49:44, Wanlong Gao wrote: > Cleanup the confused goto label, since the big lock has been removed. Thanks! Merged. Honza > > Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com> > --- > fs/ext2/super.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/fs/ext2/super.c b/fs/ext2/super.c > index b3621cb..c8e4979 100644 > --- a/fs/ext2/super.c > +++ b/fs/ext2/super.c > @@ -771,13 +771,13 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) > err = -ENOMEM; > sbi = kzalloc(sizeof(*sbi), GFP_KERNEL); > if (!sbi) > - goto failed_unlock; > + goto failed; > > sbi->s_blockgroup_lock = > kzalloc(sizeof(struct blockgroup_lock), GFP_KERNEL); > if (!sbi->s_blockgroup_lock) { > kfree(sbi); > - goto failed_unlock; > + goto failed; > } > sb->s_fs_info = sbi; > sbi->s_sb_block = sb_block; > @@ -1130,7 +1130,7 @@ failed_sbi: > sb->s_fs_info = NULL; > kfree(sbi->s_blockgroup_lock); > kfree(sbi); > -failed_unlock: > +failed: > return ret; > } > > -- > 1.7.11.rc0 >
diff --git a/fs/ext2/super.c b/fs/ext2/super.c index b3621cb..c8e4979 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c @@ -771,13 +771,13 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) err = -ENOMEM; sbi = kzalloc(sizeof(*sbi), GFP_KERNEL); if (!sbi) - goto failed_unlock; + goto failed; sbi->s_blockgroup_lock = kzalloc(sizeof(struct blockgroup_lock), GFP_KERNEL); if (!sbi->s_blockgroup_lock) { kfree(sbi); - goto failed_unlock; + goto failed; } sb->s_fs_info = sbi; sbi->s_sb_block = sb_block; @@ -1130,7 +1130,7 @@ failed_sbi: sb->s_fs_info = NULL; kfree(sbi->s_blockgroup_lock); kfree(sbi); -failed_unlock: +failed: return ret; }
Cleanup the confused goto label, since the big lock has been removed. Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com> --- fs/ext2/super.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)