lkml.org 
[lkml]   [2007]   [Oct]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] ext4: Convert bg_inode_bitmap and bg_inode_table
    Date
    From: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>

    Convert bg_inode_bitmap and bg_inode_table to bg_inode_bitmap_lo
    and bg_inode_table_lo. This helps in finding BUGs due to
    direct partial access of these split 64 bit values

    Also fix one direct partial access

    Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    ---
    fs/ext4/balloc.c | 2 +-
    fs/ext4/super.c | 12 ++++++------
    include/linux/ext4_fs.h | 4 ++--
    3 files changed, 9 insertions(+), 9 deletions(-)

    diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
    index d1a8882..7a24b3f 100644
    --- a/fs/ext4/balloc.c
    +++ b/fs/ext4/balloc.c
    @@ -103,7 +103,7 @@ unsigned ext4_init_block_bitmap(struct super_block *sb, struct buffer_head *bh,
    /* Set bits for block and inode bitmaps, and inode table */
    ext4_set_bit(ext4_block_bitmap(sb, gdp) - start, bh->b_data);
    ext4_set_bit(ext4_inode_bitmap(sb, gdp) - start, bh->b_data);
    - for (bit = le32_to_cpu(gdp->bg_inode_table) - start,
    + for (bit = (ext4_inode_table(sb, gdp) - start),
    bit_max = bit + sbi->s_itb_per_group; bit < bit_max; bit++)
    ext4_set_bit(bit, bh->b_data);
    }
    diff --git a/fs/ext4/super.c b/fs/ext4/super.c
    index 02a2418..7548408 100644
    --- a/fs/ext4/super.c
    +++ b/fs/ext4/super.c
    @@ -78,17 +78,17 @@ ext4_fsblk_t ext4_block_bitmap(struct super_block *sb,
    ext4_fsblk_t ext4_inode_bitmap(struct super_block *sb,
    struct ext4_group_desc *bg)
    {
    - return le32_to_cpu(bg->bg_inode_bitmap) |
    + return le32_to_cpu(bg->bg_inode_bitmap_lo) |
    (EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT ?
    - (ext4_fsblk_t)le32_to_cpu(bg->bg_inode_bitmap_hi) << 32 : 0);
    + (ext4_fsblk_t)le32_to_cpu(bg->bg_inode_bitmap_hi) << 32 : 0);
    }

    ext4_fsblk_t ext4_inode_table(struct super_block *sb,
    struct ext4_group_desc *bg)
    {
    - return le32_to_cpu(bg->bg_inode_table) |
    + return le32_to_cpu(bg->bg_inode_table_lo) |
    (EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT ?
    - (ext4_fsblk_t)le32_to_cpu(bg->bg_inode_table_hi) << 32 : 0);
    + (ext4_fsblk_t)le32_to_cpu(bg->bg_inode_table_hi) << 32 : 0);
    }

    void ext4_block_bitmap_set(struct super_block *sb,
    @@ -102,7 +102,7 @@ void ext4_block_bitmap_set(struct super_block *sb,
    void ext4_inode_bitmap_set(struct super_block *sb,
    struct ext4_group_desc *bg, ext4_fsblk_t blk)
    {
    - bg->bg_inode_bitmap = cpu_to_le32((u32)blk);
    + bg->bg_inode_bitmap_lo = cpu_to_le32((u32)blk);
    if (EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT)
    bg->bg_inode_bitmap_hi = cpu_to_le32(blk >> 32);
    }
    @@ -110,7 +110,7 @@ void ext4_inode_bitmap_set(struct super_block *sb,
    void ext4_inode_table_set(struct super_block *sb,
    struct ext4_group_desc *bg, ext4_fsblk_t blk)
    {
    - bg->bg_inode_table = cpu_to_le32((u32)blk);
    + bg->bg_inode_table_lo = cpu_to_le32((u32)blk);
    if (EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT)
    bg->bg_inode_table_hi = cpu_to_le32(blk >> 32);
    }
    diff --git a/include/linux/ext4_fs.h b/include/linux/ext4_fs.h
    index c26e30e..5eb4953 100644
    --- a/include/linux/ext4_fs.h
    +++ b/include/linux/ext4_fs.h
    @@ -106,8 +106,8 @@
    struct ext4_group_desc
    {
    __le32 bg_block_bitmap_lo; /* Blocks bitmap block */
    - __le32 bg_inode_bitmap; /* Inodes bitmap block */
    - __le32 bg_inode_table; /* Inodes table block */
    + __le32 bg_inode_bitmap_lo; /* Inodes bitmap block */
    + __le32 bg_inode_table_lo; /* Inodes table block */
    __le16 bg_free_blocks_count; /* Free blocks count */
    __le16 bg_free_inodes_count; /* Free inodes count */
    __le16 bg_used_dirs_count; /* Directories count */
    --
    1.5.3.2.81.g17ed
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-10-04 07:55    [W:0.056 / U:31.060 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site