From f28a2514498d7781725aca7db707dfe4fd1e53ee Mon Sep 17 00:00:00 2001 From: Nicolas Kaiser Date: Wed, 27 Oct 2010 22:08:42 -0400 Subject: [PATCH] --- yaml --- r: 218899 b: refs/heads/master c: beed5ecbaa377fa8bb6a54a6608e8725a21efdbc h: refs/heads/master i: 218897: eef55c9b0d1660be69a1859096c2f1af298d0d1e 218895: 4bb313e8c003a97b9fa4516da3bfc80a0089b451 v: v3 --- [refs] | 2 +- trunk/fs/ext4/super.c | 22 ++++++++-------------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index a33613877184..a2fb31486b15 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a6371b636f9f007ee5c90f85de048bc1b675424a +refs/heads/master: beed5ecbaa377fa8bb6a54a6608e8725a21efdbc diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c index 158d1bca8769..3b4984d37a68 100644 --- a/trunk/fs/ext4/super.c +++ b/trunk/fs/ext4/super.c @@ -2902,28 +2902,26 @@ static int ext4_register_li_request(struct super_block *sb, struct ext4_sb_info *sbi = EXT4_SB(sb); struct ext4_li_request *elr; ext4_group_t ngroups = EXT4_SB(sb)->s_groups_count; - int ret = 0; + int ret; if (sbi->s_li_request != NULL) - goto out; + return 0; if (first_not_zeroed == ngroups || (sb->s_flags & MS_RDONLY) || !test_opt(sb, INIT_INODE_TABLE)) { sbi->s_li_request = NULL; - goto out; + return 0; } if (first_not_zeroed == ngroups) { sbi->s_li_request = NULL; - goto out; + return 0; } elr = ext4_li_request_new(sb, first_not_zeroed); - if (!elr) { - ret = -ENOMEM; - goto out; - } + if (!elr) + return -ENOMEM; mutex_lock(&ext4_li_mtx); @@ -2944,14 +2942,10 @@ static int ext4_register_li_request(struct super_block *sb, if (ret) goto out; } - - mutex_unlock(&ext4_li_mtx); - out: - if (ret) { - mutex_unlock(&ext4_li_mtx); + mutex_unlock(&ext4_li_mtx); + if (ret) kfree(elr); - } return ret; }