Skip to content

Commit

Permalink
ext4: remove quota allocation when ext4_mb_new_blocks fails
Browse files Browse the repository at this point in the history
Quota allocation is not removed when ext4_mb_new_blocks calls
kmem_cache_alloc failed.  Also make sure the allocation context is freed
on the error path.

Signed-off-by: Shen Feng <shen@cn.fujitsu.com>
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
  • Loading branch information
Shen Feng authored and Theodore Ts'o committed Jul 11, 2008
1 parent f9a8ac9 commit 363d425
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions fs/ext4/mballoc.c
Original file line number Diff line number Diff line change
Expand Up @@ -4058,16 +4058,17 @@ ext4_fsblk_t ext4_mb_new_blocks(handle_t *handle,

ac = kmem_cache_alloc(ext4_ac_cachep, GFP_NOFS);
if (!ac) {
ar->len = 0;
*errp = -ENOMEM;
return 0;
goto out1;
}

ext4_mb_poll_new_transaction(sb, handle);

*errp = ext4_mb_initialize_context(ac, ar);
if (*errp) {
ar->len = 0;
goto out;
goto out2;
}

ac->ac_op = EXT4_MB_HISTORY_PREALLOC;
Expand Down Expand Up @@ -4115,11 +4116,12 @@ ext4_fsblk_t ext4_mb_new_blocks(handle_t *handle,

ext4_mb_release_context(ac);

out:
out2:
kmem_cache_free(ext4_ac_cachep, ac);
out1:
if (ar->len < inquota)
DQUOT_FREE_BLOCK(ar->inode, inquota - ar->len);

kmem_cache_free(ext4_ac_cachep, ac);
return block;
}
static void ext4_mb_poll_new_transaction(struct super_block *sb,
Expand Down

0 comments on commit 363d425

Please sign in to comment.