| Message ID | 1232679163-4176-1-git-send-email-cascardo@holoscopio.com |
|---|---|
| State | Accepted, archived |
| Headers | show |
在 2009-01-23五的 00:52 -0200，Thadeu Lima de Souza Cascardo写道： > When bg_free_blocks_count was renamed to bg_free_blocks_count_lo in > 560671a0, its uses under EXT4FS_DEBUG were not changed to the helper > ext4_free_blks_count. > > Another commit, 498e5f24, also did not change everything needed under > EXT4FS_DEBUG, thus making it spill some warnings related to printing > format. > > This commit fix both issues and make ext4 build again when EXT4FS_DEBUG > is set. > Reviewed-by: Mingming Cao <cmm@us.ibm.com> > Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com> > --- > fs/ext4/balloc.c | 6 +++--- > fs/ext4/extents.c | 2 +- > fs/ext4/mballoc.c | 2 +- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c > index 6bba06b..9a50b80 100644 > --- a/fs/ext4/balloc.c > +++ b/fs/ext4/balloc.c > @@ -684,15 +684,15 @@ ext4_fsblk_t ext4_count_free_blocks(struct super_block *sb) > gdp = ext4_get_group_desc(sb, i, NULL); > if (!gdp) > continue; > - desc_count += le16_to_cpu(gdp->bg_free_blocks_count); > + desc_count += ext4_free_blks_count(sb, gdp); > brelse(bitmap_bh); > bitmap_bh = ext4_read_block_bitmap(sb, i); > if (bitmap_bh == NULL) > continue; > > x = ext4_count_free(bitmap_bh, sb->s_blocksize); > - printk(KERN_DEBUG "group %lu: stored = %d, counted = %u\n", > - i, le16_to_cpu(gdp->bg_free_blocks_count), x); > + printk(KERN_DEBUG "group %u: stored = %d, counted = %u\n", > + i, ext4_free_blks_count(sb, gdp), x); > bitmap_count += x; > } > brelse(bitmap_bh); > diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c > index 54bf062..e2eab19 100644 > --- a/fs/ext4/extents.c > +++ b/fs/ext4/extents.c > @@ -3048,7 +3048,7 @@ retry: > WARN_ON(ret <= 0); > printk(KERN_ERR "%s: ext4_ext_get_blocks " > "returned error inode#%lu, block=%u, " > - "max_blocks=%lu", __func__, > + "max_blocks=%u", __func__, > inode->i_ino, block, max_blocks); > #endif > ext4_mark_inode_dirty(handle, inode); > diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c > index 918aec0..deba54f 100644 > --- a/fs/ext4/mballoc.c > +++ b/fs/ext4/mballoc.c > @@ -3025,7 +3025,7 @@ ext4_mb_mark_diskspace_used(struct ext4_allocation_context *ac, > goto out_err; > > ext4_debug("using block group %u(%d)\n", ac->ac_b_ex.fe_group, > - gdp->bg_free_blocks_count); > + ext4_free_blks_count(sb, gdp)); > > err = ext4_journal_get_write_access(handle, gdp_bh); > if (err) -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c index 6bba06b..9a50b80 100644 --- a/fs/ext4/balloc.c +++ b/fs/ext4/balloc.c @@ -684,15 +684,15 @@ ext4_fsblk_t ext4_count_free_blocks(struct super_block *sb) gdp = ext4_get_group_desc(sb, i, NULL); if (!gdp) continue; - desc_count += le16_to_cpu(gdp->bg_free_blocks_count); + desc_count += ext4_free_blks_count(sb, gdp); brelse(bitmap_bh); bitmap_bh = ext4_read_block_bitmap(sb, i); if (bitmap_bh == NULL) continue; x = ext4_count_free(bitmap_bh, sb->s_blocksize); - printk(KERN_DEBUG "group %lu: stored = %d, counted = %u\n", - i, le16_to_cpu(gdp->bg_free_blocks_count), x); + printk(KERN_DEBUG "group %u: stored = %d, counted = %u\n", + i, ext4_free_blks_count(sb, gdp), x); bitmap_count += x; } brelse(bitmap_bh); diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 54bf062..e2eab19 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -3048,7 +3048,7 @@ retry: WARN_ON(ret <= 0); printk(KERN_ERR "%s: ext4_ext_get_blocks " "returned error inode#%lu, block=%u, " - "max_blocks=%lu", __func__, + "max_blocks=%u", __func__, inode->i_ino, block, max_blocks); #endif ext4_mark_inode_dirty(handle, inode); diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 918aec0..deba54f 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -3025,7 +3025,7 @@ ext4_mb_mark_diskspace_used(struct ext4_allocation_context *ac, goto out_err; ext4_debug("using block group %u(%d)\n", ac->ac_b_ex.fe_group, - gdp->bg_free_blocks_count); + ext4_free_blks_count(sb, gdp)); err = ext4_journal_get_write_access(handle, gdp_bh); if (err)
When bg_free_blocks_count was renamed to bg_free_blocks_count_lo in 560671a0, its uses under EXT4FS_DEBUG were not changed to the helper ext4_free_blks_count. Another commit, 498e5f24, also did not change everything needed under EXT4FS_DEBUG, thus making it spill some warnings related to printing format. This commit fix both issues and make ext4 build again when EXT4FS_DEBUG is set. Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com> --- fs/ext4/balloc.c | 6 +++--- fs/ext4/extents.c | 2 +- fs/ext4/mballoc.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)