From 82483dfe17d036146f708809b33845c8aaf029b5 Mon Sep 17 00:00:00 2001 From: Kemeng Shi Date: Wed, 22 Feb 2023 04:30:26 +0800 Subject: [PATCH] ext4: remove unused group parameter in ext4_block_bitmap_csum_verify Remove unused group parameter in ext4_block_bitmap_csum_verify. Signed-off-by: Kemeng Shi Reviewed-by: Jan Kara Link: https://lore.kernel.org/r/20230221203027.2359920-4-shikemeng@huaweicloud.com Signed-off-by: Theodore Ts'o --- fs/ext4/balloc.c | 3 +-- fs/ext4/bitmap.c | 2 +- fs/ext4/ext4.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c index 535a8fb..0942694 100644 --- a/fs/ext4/balloc.c +++ b/fs/ext4/balloc.c @@ -385,8 +385,7 @@ static int ext4_validate_block_bitmap(struct super_block *sb, ext4_lock_group(sb, block_group); if (buffer_verified(bh)) goto verified; - if (unlikely(!ext4_block_bitmap_csum_verify(sb, block_group, - desc, bh) || + if (unlikely(!ext4_block_bitmap_csum_verify(sb, desc, bh) || ext4_simulate_fail(sb, EXT4_SIM_BBITMAP_CRC))) { ext4_unlock_group(sb, block_group); ext4_error(sb, "bg %u: bad block bitmap checksum", block_group); diff --git a/fs/ext4/bitmap.c b/fs/ext4/bitmap.c index 0186b89..3b83d97 100644 --- a/fs/ext4/bitmap.c +++ b/fs/ext4/bitmap.c @@ -54,7 +54,7 @@ void ext4_inode_bitmap_csum_set(struct super_block *sb, gdp->bg_inode_bitmap_csum_hi = cpu_to_le16(csum >> 16); } -int ext4_block_bitmap_csum_verify(struct super_block *sb, ext4_group_t group, +int ext4_block_bitmap_csum_verify(struct super_block *sb, struct ext4_group_desc *gdp, struct buffer_head *bh) { diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 55f115e..1b97a59 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -2685,7 +2685,7 @@ int ext4_inode_bitmap_csum_verify(struct super_block *sb, void ext4_block_bitmap_csum_set(struct super_block *sb, ext4_group_t group, struct ext4_group_desc *gdp, struct buffer_head *bh); -int ext4_block_bitmap_csum_verify(struct super_block *sb, ext4_group_t group, +int ext4_block_bitmap_csum_verify(struct super_block *sb, struct ext4_group_desc *gdp, struct buffer_head *bh); -- 2.7.4