leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ext4: fix awful goto in ext4_mb_new_blocks()

Browse Source 
I think the whole function could be made prettier, but
that goto really took the cake for too-clever-by-half.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
Eric Sandeen
2012-11-08 11:11:59 -05:00
committed by Theodore Ts'o
parent b72f78cb63
commit 6d138ced75
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
fs/ext4/mballoc.c
View File

@@ -4310,8 +4310,10 @@ ext4_fsblk_t ext4_mb_new_blocks(handle_t *handle,
repeat: repeat:
/* allocate space in core */ /* allocate space in core */
*errp = ext4_mb_regular_allocator(ac); *errp = ext4_mb_regular_allocator(ac);
if (*errp) if (*errp) {
ext4_discard_allocated_blocks(ac);
goto errout; goto errout;
}
/* as we've just preallocated more space than /* as we've just preallocated more space than
* user requested orinally, we store allocated * user requested orinally, we store allocated
@@ -4333,10 +4335,10 @@ repeat:
ac->ac_b_ex.fe_len = 0; ac->ac_b_ex.fe_len = 0;
ac->ac_status = AC_STATUS_CONTINUE; ac->ac_status = AC_STATUS_CONTINUE;
goto repeat; goto repeat;
} else if (*errp) } else if (*errp) {
errout:
ext4_discard_allocated_blocks(ac); ext4_discard_allocated_blocks(ac);
else { goto errout;
} else {
block = ext4_grp_offs_to_block(sb, &ac->ac_b_ex); block = ext4_grp_offs_to_block(sb, &ac->ac_b_ex);
ar->len = ac->ac_b_ex.fe_len; ar->len = ac->ac_b_ex.fe_len;
} }
@@ -4347,6 +4349,7 @@ repeat:
*errp = -ENOSPC; *errp = -ENOSPC;
} }
errout:
if (*errp) { if (*errp) {
ac->ac_b_ex.fe_len = 0; ac->ac_b_ex.fe_len = 0;
ar->len = 0; ar->len = 0;