Commit ea36e1ce authored by Andrew Morton's avatar Andrew Morton Committed by Jens Axboe

[PATCH] Fix ext3 build when EXT3_DEBUG is defined

When EXT3_DEBUG is turned on (by editing the header file) there is one
compile failure and a few warnings.  Fix that up.
parent 3f31e635
...@@ -503,7 +503,8 @@ ext3_new_block(handle_t *handle, struct inode *inode, unsigned long goal, ...@@ -503,7 +503,8 @@ ext3_new_block(handle_t *handle, struct inode *inode, unsigned long goal,
got_block: got_block:
ext3_debug("using block group %d(%d)\n", i, gdp->bg_free_blocks_count); ext3_debug("using block group %d(%d)\n",
group_no, gdp->bg_free_blocks_count);
/* Make sure we use undo access for the bitmap, because it is /* Make sure we use undo access for the bitmap, because it is
critical that we do the frozen_data COW on bitmap buffers in critical that we do the frozen_data COW on bitmap buffers in
...@@ -658,7 +659,7 @@ unsigned long ext3_count_free_blocks(struct super_block *sb) ...@@ -658,7 +659,7 @@ unsigned long ext3_count_free_blocks(struct super_block *sb)
bitmap_count += x; bitmap_count += x;
} }
brelse(bitmap_bh); brelse(bitmap_bh);
printk("ext3_count_free_blocks: stored = %lu, computed = %lu, %lu\n", printk("ext3_count_free_blocks: stored = %u, computed = %lu, %lu\n",
le32_to_cpu(es->s_free_blocks_count), desc_count, bitmap_count); le32_to_cpu(es->s_free_blocks_count), desc_count, bitmap_count);
unlock_super(sb); unlock_super(sb);
return bitmap_count; return bitmap_count;
......
...@@ -704,7 +704,7 @@ unsigned long ext3_count_free_inodes (struct super_block * sb) ...@@ -704,7 +704,7 @@ unsigned long ext3_count_free_inodes (struct super_block * sb)
bitmap_count += x; bitmap_count += x;
} }
brelse(bitmap_bh); brelse(bitmap_bh);
printk("ext3_count_free_inodes: stored = %lu, computed = %lu, %lu\n", printk("ext3_count_free_inodes: stored = %u, computed = %lu, %lu\n",
le32_to_cpu(es->s_free_inodes_count), desc_count, bitmap_count); le32_to_cpu(es->s_free_inodes_count), desc_count, bitmap_count);
unlock_super(sb); unlock_super(sb);
return desc_count; return desc_count;
......
...@@ -263,12 +263,12 @@ void ext3_discard_prealloc (struct inode * inode) ...@@ -263,12 +263,12 @@ void ext3_discard_prealloc (struct inode * inode)
static int ext3_alloc_block (handle_t *handle, static int ext3_alloc_block (handle_t *handle,
struct inode * inode, unsigned long goal, int *err) struct inode * inode, unsigned long goal, int *err)
{ {
#ifdef EXT3FS_DEBUG
static unsigned long alloc_hits = 0, alloc_attempts = 0;
#endif
unsigned long result; unsigned long result;
#ifdef EXT3_PREALLOCATE #ifdef EXT3_PREALLOCATE
#ifdef EXT3FS_DEBUG
static unsigned long alloc_hits = 0, alloc_attempts = 0;
#endif
struct ext3_inode_info *ei = EXT3_I(inode); struct ext3_inode_info *ei = EXT3_I(inode);
/* Writer: ->i_prealloc* */ /* Writer: ->i_prealloc* */
if (ei->i_prealloc_count && if (ei->i_prealloc_count &&
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment