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 29/36] ext4: mark the blocks/inode bitmap beyond end of group as used

    2.6.27-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 648f5879f5892dddd3ba71cd0d285599f40f2512)
    We need to mark the block/inode bitmap beyond the end of the group
    with '1'.

    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/ialloc.c | 2 +-
    fs/ext4/mballoc.c | 4 ++--
    fs/ext4/resize.c | 6 ++----
    3 files changed, 5 insertions(+), 7 deletions(-)
    --- a/fs/ext4/ialloc.c
    +++ b/fs/ext4/ialloc.c
    @@ -84,7 +84,7 @@ unsigned ext4_init_inode_bitmap(struct s
    }

    memset(bh->b_data, 0, (EXT4_INODES_PER_GROUP(sb) + 7) / 8);
    - mark_bitmap_end(EXT4_INODES_PER_GROUP(sb), EXT4_BLOCKS_PER_GROUP(sb),
    + mark_bitmap_end(EXT4_INODES_PER_GROUP(sb), sb->s_blocksize * 8,
    bh->b_data);

    return EXT4_INODES_PER_GROUP(sb);
    --- a/fs/ext4/mballoc.c
    +++ b/fs/ext4/mballoc.c
    @@ -3148,8 +3148,8 @@ ext4_mb_mark_diskspace_used(struct ext4_
    in_range(block + len - 1, ext4_inode_table(sb, gdp),
    EXT4_SB(sb)->s_itb_per_group)) {
    ext4_error(sb, __func__,
    - "Allocating block in system zone - block = %llu",
    - block);
    + "Allocating block %llu in system zone of %d group\n",
    + block, ac->ac_b_ex.fe_group);
    /* File system mounted not to panic on error
    * Fix the bitmap and repeat the block allocation
    * We leak some of the blocks here.
    --- a/fs/ext4/resize.c
    +++ b/fs/ext4/resize.c
    @@ -284,11 +284,9 @@ static int setup_new_group_blocks(struct
    if ((err = extend_or_restart_transaction(handle, 2, bh)))
    goto exit_bh;

    - mark_bitmap_end(input->blocks_count, EXT4_BLOCKS_PER_GROUP(sb),
    - bh->b_data);
    + mark_bitmap_end(input->blocks_count, sb->s_blocksize * 8, bh->b_data);
    ext4_journal_dirty_metadata(handle, bh);
    brelse(bh);
    -
    /* Mark unused entries in inode bitmap used */
    ext4_debug("clear inode bitmap %#04llx (+%llu)\n",
    input->inode_bitmap, input->inode_bitmap - start);
    @@ -297,7 +295,7 @@ static int setup_new_group_blocks(struct
    goto exit_journal;
    }

    - mark_bitmap_end(EXT4_INODES_PER_GROUP(sb), EXT4_BLOCKS_PER_GROUP(sb),
    + mark_bitmap_end(EXT4_INODES_PER_GROUP(sb), sb->s_blocksize * 8,
    bh->b_data);
    ext4_journal_dirty_metadata(handle, bh);
    exit_bh:


    \
     
     \ /
      Last update: 2009-02-18 23:45    [W:0.596 / U:0.152 seconds]
    ©2003-2014 Jasper Spaans. hosted at Digital Ocean