On Mon, Mar 04, 2013 at 04:30:26AM -0500, CAI Qian wrote: > Hello Lukas and Ted, > > This is to back-port to 3.4-stable which fixed the context and drop the last > chunk due to inapplicable there. Please help review and ACK.
Thanks, I've queued this backport to 3.5 tree as well. Cheers, -- Luis > > Regards, CAI Qian > > From 810da240f221d64bf90020f25941b05b378186fe Mon Sep 17 00:00:00 2001 > From: Lukas Czerner <[email protected]> > Date: Sat, 2 Mar 2013 17:18:58 -0500 > Subject: [PATCH] ext4: convert number of blocks to clusters properly > > We're using macro EXT4_B2C() to convert number of blocks to number of > clusters for bigalloc file systems. However, we should be using > EXT4_NUM_B2C(). > > Signed-off-by: Lukas Czerner <[email protected]> > Signed-off-by: "Theodore Ts'o" <[email protected]> > Cc: [email protected] > Signed-off-by: CAI Qian <[email protected]> > > diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c > index 3e1018a..d33733e 100644 > --- a/fs/ext4/balloc.c > +++ b/fs/ext4/balloc.c > @@ -600,7 +600,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 > diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c > index 3122ece..7ee69fe 100644 > --- a/fs/ext4/mballoc.c > +++ b/fs/ext4/mballoc.c > @@ -3433,7 +3433,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); > } > @@ -4577,7 +4577,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; > @@ -4808,11 +4808,11 @@ int ext4_group_add_blocks(handle_t *handle, struct > super_block *sb, > desc->bg_checksum = ext4_group_desc_csum(sbi, 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); > } > > diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c > index 231cacb..b407c78 100644 > --- a/fs/ext4/resize.c > +++ b/fs/ext4/resize.c > @@ -1112,7 +1112,7 @@ static int ext4_setup_new_descs(handle_t *handle, > struct super_block *sb, > ext4_inode_bitmap_set(sb, gdp, group_data->inode_bitmap); > 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)); > gdp->bg_flags = cpu_to_le16(*bg_flags); > gdp->bg_checksum = ext4_group_desc_csum(sbi, group, gdp); > @@ -1210,7 +1210,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); > > @@ -1219,7 +1219,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); > -- > To unsubscribe from this list: send the line "unsubscribe stable" in > the body of a message to [email protected] > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
