ext4: remove unused group parameter in ext4_block_bitmap_csum_set

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Remove unused group parameter in ext4_block_bitmap_csum_set. After this,
group parameter in ext4_set_bitmap_checksums is also not used, just
remove it too.

Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20230221203027.2359920-5-shikemeng@huaweicloud.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

authored by

Kemeng Shi and committed by

Theodore Ts'o 3 years ago 1df9bde4 82483dfe

+11 -14

5 changed files

expand all

ext4

bitmap.c

ext4.h

ialloc.c

mballoc.c

resize.c

+1 -1

fs/ext4/bitmap.c

··· 80 80 return 0; 81 81 } 82 82 83 - void ext4_block_bitmap_csum_set(struct super_block *sb, ext4_group_t group, 83 + void ext4_block_bitmap_csum_set(struct super_block *sb, 84 84 struct ext4_group_desc *gdp, 85 85 struct buffer_head *bh) 86 86 {

+1 -1

fs/ext4/ext4.h

··· 2682 2682 int ext4_inode_bitmap_csum_verify(struct super_block *sb, 2683 2683 struct ext4_group_desc *gdp, 2684 2684 struct buffer_head *bh, int sz); 2685 - void ext4_block_bitmap_csum_set(struct super_block *sb, ext4_group_t group, 2685 + void ext4_block_bitmap_csum_set(struct super_block *sb, 2686 2686 struct ext4_group_desc *gdp, 2687 2687 struct buffer_head *bh); 2688 2688 int ext4_block_bitmap_csum_verify(struct super_block *sb,

+2 -4

fs/ext4/ialloc.c

··· 813 813 gdp->bg_flags &= cpu_to_le16(~EXT4_BG_BLOCK_UNINIT); 814 814 ext4_free_group_clusters_set(sb, gdp, 815 815 ext4_free_clusters_after_init(sb, group, gdp)); 816 - ext4_block_bitmap_csum_set(sb, group, gdp, 817 - block_bitmap_bh); 816 + ext4_block_bitmap_csum_set(sb, gdp, block_bitmap_bh); 818 817 ext4_group_desc_csum_set(sb, group, gdp); 819 818 } 820 819 ext4_unlock_group(sb, group); ··· 1164 1165 gdp->bg_flags &= cpu_to_le16(~EXT4_BG_BLOCK_UNINIT); 1165 1166 ext4_free_group_clusters_set(sb, gdp, 1166 1167 ext4_free_clusters_after_init(sb, group, gdp)); 1167 - ext4_block_bitmap_csum_set(sb, group, gdp, 1168 - block_bitmap_bh); 1168 + ext4_block_bitmap_csum_set(sb, gdp, block_bitmap_bh); 1169 1169 ext4_group_desc_csum_set(sb, group, gdp); 1170 1170 } 1171 1171 ext4_unlock_group(sb, group);

+5 -5

fs/ext4/mballoc.c

··· 3822 3822 } 3823 3823 len = ext4_free_group_clusters(sb, gdp) - ac->ac_b_ex.fe_len; 3824 3824 ext4_free_group_clusters_set(sb, gdp, len); 3825 - ext4_block_bitmap_csum_set(sb, ac->ac_b_ex.fe_group, gdp, bitmap_bh); 3825 + ext4_block_bitmap_csum_set(sb, gdp, bitmap_bh); 3826 3826 ext4_group_desc_csum_set(sb, ac->ac_b_ex.fe_group, gdp); 3827 3827 3828 3828 ext4_unlock_group(sb, ac->ac_b_ex.fe_group); ··· 3929 3929 clen = ext4_free_group_clusters(sb, gdp) + clen_changed; 3930 3930 3931 3931 ext4_free_group_clusters_set(sb, gdp, clen); 3932 - ext4_block_bitmap_csum_set(sb, group, gdp, bitmap_bh); 3932 + ext4_block_bitmap_csum_set(sb, gdp, bitmap_bh); 3933 3933 ext4_group_desc_csum_set(sb, group, gdp); 3934 3934 3935 3935 ext4_unlock_group(sb, group); ··· 5861 5861 ext4_free_group_clusters_set( 5862 5862 sb, gdp, ext4_free_group_clusters(sb, gdp) + 5863 5863 count - already_freed); 5864 - ext4_block_bitmap_csum_set(sb, group, gdp, bitmap_bh); 5864 + ext4_block_bitmap_csum_set(sb, gdp, bitmap_bh); 5865 5865 ext4_group_desc_csum_set(sb, group, gdp); 5866 5866 ext4_handle_dirty_metadata(NULL, NULL, gdp_bh); 5867 5867 sync_dirty_buffer(bitmap_bh); ··· 6023 6023 6024 6024 ret = ext4_free_group_clusters(sb, gdp) + count_clusters; 6025 6025 ext4_free_group_clusters_set(sb, gdp, ret); 6026 - ext4_block_bitmap_csum_set(sb, block_group, gdp, bitmap_bh); 6026 + ext4_block_bitmap_csum_set(sb, gdp, bitmap_bh); 6027 6027 ext4_group_desc_csum_set(sb, block_group, gdp); 6028 6028 ext4_unlock_group(sb, block_group); 6029 6029 ··· 6280 6280 free_clusters_count = clusters_freed + 6281 6281 ext4_free_group_clusters(sb, desc); 6282 6282 ext4_free_group_clusters_set(sb, desc, free_clusters_count); 6283 - ext4_block_bitmap_csum_set(sb, block_group, desc, bitmap_bh); 6283 + ext4_block_bitmap_csum_set(sb, desc, bitmap_bh); 6284 6284 ext4_group_desc_csum_set(sb, block_group, desc); 6285 6285 ext4_unlock_group(sb, block_group); 6286 6286 percpu_counter_add(&sbi->s_freeclusters_counter,

+2 -3

fs/ext4/resize.c

··· 1306 1306 } 1307 1307 1308 1308 static int ext4_set_bitmap_checksums(struct super_block *sb, 1309 - ext4_group_t group, 1310 1309 struct ext4_group_desc *gdp, 1311 1310 struct ext4_new_group_data *group_data) 1312 1311 { ··· 1324 1325 bh = ext4_get_bitmap(sb, group_data->block_bitmap); 1325 1326 if (!bh) 1326 1327 return -EIO; 1327 - ext4_block_bitmap_csum_set(sb, group, gdp, bh); 1328 + ext4_block_bitmap_csum_set(sb, gdp, bh); 1328 1329 brelse(bh); 1329 1330 1330 1331 return 0; ··· 1362 1363 memset(gdp, 0, EXT4_DESC_SIZE(sb)); 1363 1364 ext4_block_bitmap_set(sb, gdp, group_data->block_bitmap); 1364 1365 ext4_inode_bitmap_set(sb, gdp, group_data->inode_bitmap); 1365 - err = ext4_set_bitmap_checksums(sb, group, gdp, group_data); 1366 + err = ext4_set_bitmap_checksums(sb, gdp, group_data); 1366 1367 if (err) { 1367 1368 ext4_std_error(sb, err); 1368 1369 break;