From c439b09c7cd5ff1724fab73d3953701814061f43 Mon Sep 17 00:00:00 2001 From: Wanlong Gao Date: Thu, 28 Jun 2012 00:49:44 +0800 Subject: [PATCH] --- yaml --- r: 316701 b: refs/heads/master c: e124a32043416ddefaec3c54cc945b7667c00628 h: refs/heads/master i: 316699: 3749a0e6f3b0c21b1501bb76eb5fd3598f9b0fb0 v: v3 --- [refs] | 2 +- trunk/fs/ext2/super.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d77b9f6cb5cd..2bef75703757 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a0e589b485cd5e6a74d40d195b3d7de212b4227d +refs/heads/master: e124a32043416ddefaec3c54cc945b7667c00628 diff --git a/trunk/fs/ext2/super.c b/trunk/fs/ext2/super.c index b3621cb7ea31..c8e49794ab5d 100644 --- a/trunk/fs/ext2/super.c +++ b/trunk/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 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) sb->s_fs_info = NULL; kfree(sbi->s_blockgroup_lock); kfree(sbi); -failed_unlock: +failed: return ret; }