lkml.org 
[lkml]   [2008]   [Jul]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 16/52] ext4: remove quota allocation when ext4_mb_new_blocks fails
    Date
    From: Shen Feng <shen@cn.fujitsu.com>

    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>
    ---
    fs/ext4/mballoc.c | 10 ++++++----
    1 files changed, 6 insertions(+), 4 deletions(-)

    diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
    index 11acfe5..8b67414 100644
    --- a/fs/ext4/mballoc.c
    +++ b/fs/ext4/mballoc.c
    @@ -4052,8 +4052,9 @@ 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);
    @@ -4061,7 +4062,7 @@ ext4_fsblk_t ext4_mb_new_blocks(handle_t *handle,
    *errp = ext4_mb_initialize_context(ac, ar);
    if (*errp) {
    ar->len = 0;
    - goto out;
    + goto out2;
    }

    ac->ac_op = EXT4_MB_HISTORY_PREALLOC;
    @@ -4109,11 +4110,12 @@ repeat:

    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,
    --
    1.5.6.rc3.1.g36b7.dirty


    \
     
     \ /
      Last update: 2008-07-05 19:53    [W:0.063 / U:0.772 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site