Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 218899
b: refs/heads/master
c: beed5ec
h: refs/heads/master
i:
  218897: eef55c9
  218895: 4bb313e
v: v3
  • Loading branch information
Nicolas Kaiser authored and Theodore Ts'o committed Oct 28, 2010
1 parent 813ba10 commit f28a251
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 15 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a6371b636f9f007ee5c90f85de048bc1b675424a
refs/heads/master: beed5ecbaa377fa8bb6a54a6608e8725a21efdbc
22 changes: 8 additions & 14 deletions trunk/fs/ext4/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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;
}

Expand Down

0 comments on commit f28a251

Please sign in to comment.