Add ext4_inode_bitmap_csum_get() and ext4_inode_bitmap_csum_store() helpers, and use EXT4_DESC_SIZE(sb) instead of sbi->s_desc_size for consistency. No functional change. Signed-off-by: Baokun Li --- fs/ext4/bitmap.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/fs/ext4/bitmap.c b/fs/ext4/bitmap.c index 00b0a3c74859..008acc439301 100644 --- a/fs/ext4/bitmap.c +++ b/fs/ext4/bitmap.c @@ -16,11 +16,29 @@ unsigned int ext4_count_free(char *bitmap, unsigned int numchars) return numchars * BITS_PER_BYTE - memweight(bitmap, numchars); } +static inline __u32 ext4_inode_bitmap_csum_get(struct super_block *sb, + struct ext4_group_desc *gdp) +{ + __u32 csum = le16_to_cpu(gdp->bg_inode_bitmap_csum_lo); + + if (EXT4_DESC_SIZE(sb) >= EXT4_BG_INODE_BITMAP_CSUM_HI_END) + csum |= (__u32)le16_to_cpu(gdp->bg_inode_bitmap_csum_hi) << 16; + return csum; +} + +static inline void ext4_inode_bitmap_csum_store(struct super_block *sb, + struct ext4_group_desc *gdp, + __u32 csum) +{ + gdp->bg_inode_bitmap_csum_lo = cpu_to_le16(csum & 0xFFFF); + if (EXT4_DESC_SIZE(sb) >= EXT4_BG_INODE_BITMAP_CSUM_HI_END) + gdp->bg_inode_bitmap_csum_hi = cpu_to_le16(csum >> 16); +} + int ext4_inode_bitmap_csum_verify(struct super_block *sb, struct ext4_group_desc *gdp, struct buffer_head *bh) { - __u32 hi; __u32 provided, calculated; struct ext4_sb_info *sbi = EXT4_SB(sb); int sz; @@ -29,12 +47,9 @@ int ext4_inode_bitmap_csum_verify(struct super_block *sb, return 1; sz = EXT4_INODES_PER_GROUP(sb) >> 3; - provided = le16_to_cpu(gdp->bg_inode_bitmap_csum_lo); + provided = ext4_inode_bitmap_csum_get(sb, gdp); calculated = ext4_chksum(sbi->s_csum_seed, (__u8 *)bh->b_data, sz); - if (sbi->s_desc_size >= EXT4_BG_INODE_BITMAP_CSUM_HI_END) { - hi = le16_to_cpu(gdp->bg_inode_bitmap_csum_hi); - provided |= (hi << 16); - } else + if (EXT4_DESC_SIZE(sb) < EXT4_BG_INODE_BITMAP_CSUM_HI_END) calculated &= 0xFFFF; return provided == calculated; @@ -53,9 +68,7 @@ void ext4_inode_bitmap_csum_set(struct super_block *sb, sz = EXT4_INODES_PER_GROUP(sb) >> 3; csum = ext4_chksum(sbi->s_csum_seed, (__u8 *)bh->b_data, sz); - gdp->bg_inode_bitmap_csum_lo = cpu_to_le16(csum & 0xFFFF); - if (sbi->s_desc_size >= EXT4_BG_INODE_BITMAP_CSUM_HI_END) - gdp->bg_inode_bitmap_csum_hi = cpu_to_le16(csum >> 16); + ext4_inode_bitmap_csum_store(sb, gdp, csum); } static inline __u32 ext4_block_bitmap_csum_get(struct super_block *sb, -- 2.43.7