lkml.org 
[lkml]   [2009]   [Feb]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 33/39] ext4: Fix s_dirty_blocks_counter if block allocation failed with nodelalloc

    2.6.28-stable review patch. If anyone has any objections, please let us know.

    ------------------
    From: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>

    (cherry picked from commit 0087d9fb3f29f59e8d42c8b058376d80e5adde4c)

    With nodelalloc option we need to update the dirty block counter on
    block allocation failure. This is needed because we increment the
    dirty block counter early in the block allocation phase. Without
    the patch s_dirty_blocks_counter goes wrong so that filesystem's
    free blocks decreases incorrectly.

    Tested-by: Akira Fujita <a-fujita@rs.jp.nec.com>
    Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    fs/ext4/mballoc.c | 9 ++++++++-
    1 file changed, 8 insertions(+), 1 deletion(-)
    --- a/fs/ext4/mballoc.c
    +++ b/fs/ext4/mballoc.c
    @@ -4538,7 +4538,7 @@ ext4_fsblk_t ext4_mb_new_blocks(handle_t
    }
    if (ar->len == 0) {
    *errp = -EDQUOT;
    - return 0;
    + goto out3;
    }
    inquota = ar->len;

    @@ -4611,6 +4611,13 @@ out2:
    out1:
    if (ar->len < inquota)
    DQUOT_FREE_BLOCK(ar->inode, inquota - ar->len);
    +out3:
    + if (!ar->len) {
    + if (!EXT4_I(ar->inode)->i_delalloc_reserved_flag)
    + /* release all the reserved blocks if non delalloc */
    + percpu_counter_sub(&sbi->s_dirtyblocks_counter,
    + reserv_blks);
    + }

    return block;
    }


    \
     
     \ /
      Last update: 2009-02-18 22:49    [W:0.582 / U:0.000 seconds]
    ©2003-2014 Jasper Spaans. Advertise on this site