ext4: Convert number of blocks to clusters properly
PATCH 1/1 ext4: Convert number of blocks to clusters properly
We're using macro EXT4_B2C() to convert number of blocks to number of clusters, however we should be using EXT4_NUM_B2C(). Fix that.
Signed-off-by Lukas Czerner <[email protected]>
--- fs/ext4/balloc.c | 2 +- fs/ext4/mballoc.c | 8 ++++---- fs/ext4/resize.c | 6 +++--- fs/ext4/super.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-)
fs/ext4/balloc.c +1 -1
@@ -633,7 +633,7 @@ ext4_fsblk_t ext4_count_free_clusters(struct super_block *sb)brelse (bitmap_bh);printk (KERN_DEBUG "ext4_count_free_clusters: stored = %llu" ", computed = %llu, %llu\n" , -EXT4_B2C (EXT4_SB (sb),ext4_free_blocks_count (es)), +EXT4_NUM_B2C (EXT4_SB (sb),ext4_free_blocks_count (es)), desc_count, bitmap_count);return bitmap_count;#else
fs/ext4/mballoc.c +4 -4
@@ -3444,7 +3444,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) win = offs; ac->ac_b_ex.fe_logical = ac->ac_o_ex.fe_logical - -EXT4_B2C (sbi, win); +EXT4_NUM_B2C (sbi, win);BUG_ON (ac->ac_o_ex.fe_logical < ac->ac_b_ex.fe_logical);BUG_ON (ac->ac_o_ex.fe_len > ac->ac_b_ex.fe_len); }
@@ -4590,7 +4590,7 @@ do_more:EXT4_BLOCKS_PER_GROUP (sb); count -= overflow; } - count_clusters =EXT4_B2C (sbi, count); + count_clusters =EXT4_NUM_B2C (sbi, count); bitmap_bh =ext4_read_block_bitmap (sb, block_group);if (!bitmap_bh) { err = -EIO ;
@@ -4832,11 +4832,11 @@ int ext4_group_add_blocks(handle_t *handle, struct super_block *sb,ext4_group_desc_csum_set (sb, block_group, desc);ext4_unlock_group (sb, block_group);percpu_counter_add (&sbi->s_freeclusters_counter, -EXT4_B2C (sbi, blocks_freed)); +EXT4_NUM_B2C (sbi, blocks_freed));if (sbi->s_log_groups_per_flex) {ext4_group_t flex_group =ext4_flex_group (sbi, block_group); -atomic_add (EXT4_B2C (sbi, blocks_freed), +atomic_add (EXT4_NUM_B2C (sbi, blocks_freed), &sbi->s_flex_groups[flex_group].free_clusters); }
fs/ext4/resize.c +3 -3
@@ -1247,7 +1247,7 @@ static int ext4_setup_new_descs(handle_t *handle, struct super_block *sb,ext4_inode_table_set (sb, gdp, group_data->inode_table);ext4_free_group_clusters_set (sb, gdp, -EXT4_B2C (sbi, group_data->free_blocks_count)); +EXT4_NUM_B2C (sbi, group_data->free_blocks_count));ext4_free_inodes_set (sb, gdp,EXT4_INODES_PER_GROUP (sb));if (ext4_has_group_desc_csum (sb)) ext4_itable_unused_set(sb, gdp,
@@ -1349,7 +1349,7 @@ static void ext4_update_super(struct super_block *sb,/* Update the free space counts */ percpu_counter_add (&sbi->s_freeclusters_counter, -EXT4_B2C (sbi, free_blocks)); +EXT4_NUM_B2C (sbi, free_blocks));percpu_counter_add (&sbi->s_freeinodes_counter,EXT4_INODES_PER_GROUP (sb) * flex_gd->count);
@@ -1360,7 +1360,7 @@ static void ext4_update_super(struct super_block *sb, sbi->s_log_groups_per_flex) {ext4_group_t flex_group; flex_group =ext4_flex_group (sbi, group_data[0 ].group); -atomic_add (EXT4_B2C (sbi, free_blocks), +atomic_add (EXT4_NUM_B2C (sbi, free_blocks), &sbi->s_flex_groups[flex_group].free_clusters);atomic_add (EXT4_INODES_PER_GROUP (sb) * flex_gd->count, &sbi->s_flex_groups[flex_group].free_inodes);
fs/ext4/super.c +1 -1
@@ -3235,7 +3235,7 @@ int ext4_calculate_overhead(struct super_block *sb) }/* Add the journal blocks as well */ if (sbi->s_journal) - overhead +=EXT4_B2C (sbi, sbi->s_journal->j_maxlen); + overhead +=EXT4_NUM_B2C (sbi, sbi->s_journal->j_maxlen); sbi->s_overhead = overhead;smp_wmb ();
Signature · 1 line
1.7.7.6
Quoted 4 lines · Lukas Czerner
We're using macro
EXT4_B2C()to convert number of blocks to number of clusters, however we should be usingEXT4_NUM_B2C(). Fix that.Signed-off-by Lukas Czerner <[email protected]>
Thanks, applied.
- Ted