diff options
| author | Eric Sandeen <sandeen@redhat.com> | 2012-11-08 11:11:59 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2012-11-08 11:11:59 -0500 |
| commit | 6d138ced751d4e41e02c38ad55d1b3cd2913b150 (patch) | |
| tree | 65034e5f0e777ef00f61ca6082ee992df57884d1 | |
| parent | b72f78cb63fb595af63fc781dced0a6fd354e572 (diff) | |
| download | linux-6d138ced751d4e41e02c38ad55d1b3cd2913b150.tar.gz linux-6d138ced751d4e41e02c38ad55d1b3cd2913b150.tar.xz | |
ext4: fix awful goto in ext4_mb_new_blocks()
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>
| -rw-r--r-- | fs/ext4/mballoc.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 526e55358606..27f421c8043d 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4310,8 +4310,10 @@ ext4_fsblk_t ext4_mb_new_blocks(handle_t *handle, repeat: /* allocate space in core */ *errp = ext4_mb_regular_allocator(ac); - if (*errp) + if (*errp) { + ext4_discard_allocated_blocks(ac); goto errout; + } /* as we've just preallocated more space than * user requested orinally, we store allocated @@ -4333,10 +4335,10 @@ repeat: ac->ac_b_ex.fe_len = 0; ac->ac_status = AC_STATUS_CONTINUE; goto repeat; - } else if (*errp) - errout: + } else if (*errp) { ext4_discard_allocated_blocks(ac); - else { + goto errout; + } else { block = ext4_grp_offs_to_block(sb, &ac->ac_b_ex); ar->len = ac->ac_b_ex.fe_len; } @@ -4347,6 +4349,7 @@ repeat: *errp = -ENOSPC; } +errout: if (*errp) { ac->ac_b_ex.fe_len = 0; ar->len = 0; |