diff options
Diffstat (limited to 'fs/ext4/balloc.c')
-rw-r--r-- | fs/ext4/balloc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c index a711898923f0..a0c23b03a264 100644 --- a/fs/ext4/balloc.c +++ b/fs/ext4/balloc.c | |||
@@ -205,8 +205,8 @@ struct ext4_group_desc * ext4_get_group_desc(struct super_block *sb, | |||
205 | ext4_group_t block_group, | 205 | ext4_group_t block_group, |
206 | struct buffer_head **bh) | 206 | struct buffer_head **bh) |
207 | { | 207 | { |
208 | unsigned long group_desc; | 208 | unsigned int group_desc; |
209 | unsigned long offset; | 209 | unsigned int offset; |
210 | struct ext4_group_desc *desc; | 210 | struct ext4_group_desc *desc; |
211 | struct ext4_sb_info *sbi = EXT4_SB(sb); | 211 | struct ext4_sb_info *sbi = EXT4_SB(sb); |
212 | 212 | ||
@@ -225,7 +225,7 @@ struct ext4_group_desc * ext4_get_group_desc(struct super_block *sb, | |||
225 | if (!sbi->s_group_desc[group_desc]) { | 225 | if (!sbi->s_group_desc[group_desc]) { |
226 | ext4_error(sb, "ext4_get_group_desc", | 226 | ext4_error(sb, "ext4_get_group_desc", |
227 | "Group descriptor not loaded - " | 227 | "Group descriptor not loaded - " |
228 | "block_group = %u, group_desc = %lu, desc = %lu", | 228 | "block_group = %u, group_desc = %u, desc = %u", |
229 | block_group, group_desc, offset); | 229 | block_group, group_desc, offset); |
230 | return NULL; | 230 | return NULL; |
231 | } | 231 | } |
@@ -372,8 +372,8 @@ void ext4_free_blocks_sb(handle_t *handle, struct super_block *sb, | |||
372 | struct buffer_head *gd_bh; | 372 | struct buffer_head *gd_bh; |
373 | ext4_group_t block_group; | 373 | ext4_group_t block_group; |
374 | ext4_grpblk_t bit; | 374 | ext4_grpblk_t bit; |
375 | unsigned long i; | 375 | unsigned int i; |
376 | unsigned long overflow; | 376 | unsigned int overflow; |
377 | struct ext4_group_desc *desc; | 377 | struct ext4_group_desc *desc; |
378 | struct ext4_super_block *es; | 378 | struct ext4_super_block *es; |
379 | struct ext4_sb_info *sbi; | 379 | struct ext4_sb_info *sbi; |
@@ -720,7 +720,7 @@ ext4_fsblk_t ext4_count_free_blocks(struct super_block *sb) | |||
720 | #ifdef EXT4FS_DEBUG | 720 | #ifdef EXT4FS_DEBUG |
721 | struct ext4_super_block *es; | 721 | struct ext4_super_block *es; |
722 | ext4_fsblk_t bitmap_count; | 722 | ext4_fsblk_t bitmap_count; |
723 | unsigned long x; | 723 | unsigned int x; |
724 | struct buffer_head *bitmap_bh = NULL; | 724 | struct buffer_head *bitmap_bh = NULL; |
725 | 725 | ||
726 | es = EXT4_SB(sb)->s_es; | 726 | es = EXT4_SB(sb)->s_es; |
@@ -740,7 +740,7 @@ ext4_fsblk_t ext4_count_free_blocks(struct super_block *sb) | |||
740 | continue; | 740 | continue; |
741 | 741 | ||
742 | x = ext4_count_free(bitmap_bh, sb->s_blocksize); | 742 | x = ext4_count_free(bitmap_bh, sb->s_blocksize); |
743 | printk(KERN_DEBUG "group %lu: stored = %d, counted = %lu\n", | 743 | printk(KERN_DEBUG "group %lu: stored = %d, counted = %u\n", |
744 | i, le16_to_cpu(gdp->bg_free_blocks_count), x); | 744 | i, le16_to_cpu(gdp->bg_free_blocks_count), x); |
745 | bitmap_count += x; | 745 | bitmap_count += x; |
746 | } | 746 | } |