[PATCH] ext3: EXT3_DEBUG build fixes
Fix some warnings and a build error when EXT3_DEBUG is enabled. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
f65d9bea86
commit
8bdac5d1ed
|
@ -1410,7 +1410,7 @@ unsigned long ext3_count_free_blocks(struct super_block *sb)
|
|||
unsigned long desc_count;
|
||||
struct ext3_group_desc *gdp;
|
||||
int i;
|
||||
unsigned long ngroups;
|
||||
unsigned long ngroups = EXT3_SB(sb)->s_groups_count;
|
||||
#ifdef EXT3FS_DEBUG
|
||||
struct ext3_super_block *es;
|
||||
unsigned long bitmap_count, x;
|
||||
|
@ -1421,7 +1421,8 @@ unsigned long ext3_count_free_blocks(struct super_block *sb)
|
|||
desc_count = 0;
|
||||
bitmap_count = 0;
|
||||
gdp = NULL;
|
||||
for (i = 0; i < EXT3_SB(sb)->s_groups_count; i++) {
|
||||
|
||||
for (i = 0; i < ngroups; i++) {
|
||||
gdp = ext3_get_group_desc(sb, i, NULL);
|
||||
if (!gdp)
|
||||
continue;
|
||||
|
@ -1443,7 +1444,6 @@ unsigned long ext3_count_free_blocks(struct super_block *sb)
|
|||
return bitmap_count;
|
||||
#else
|
||||
desc_count = 0;
|
||||
ngroups = EXT3_SB(sb)->s_groups_count;
|
||||
smp_rmb();
|
||||
for (i = 0; i < ngroups; i++) {
|
||||
gdp = ext3_get_group_desc(sb, i, NULL);
|
||||
|
|
|
@ -242,7 +242,7 @@ static int setup_new_group_blocks(struct super_block *sb,
|
|||
i < sbi->s_itb_per_group; i++, bit++, block++) {
|
||||
struct buffer_head *it;
|
||||
|
||||
ext3_debug("clear inode block %#04x (+%ld)\n", block, bit);
|
||||
ext3_debug("clear inode block %#04lx (+%d)\n", block, bit);
|
||||
if (IS_ERR(it = bclean(handle, sb, block))) {
|
||||
err = PTR_ERR(it);
|
||||
goto exit_bh;
|
||||
|
@ -643,8 +643,8 @@ static void update_backups(struct super_block *sb,
|
|||
break;
|
||||
|
||||
bh = sb_getblk(sb, group * bpg + blk_off);
|
||||
ext3_debug(sb, __FUNCTION__, "update metadata backup %#04lx\n",
|
||||
bh->b_blocknr);
|
||||
ext3_debug("update metadata backup %#04lx\n",
|
||||
(unsigned long)bh->b_blocknr);
|
||||
if ((err = ext3_journal_get_write_access(handle, bh)))
|
||||
break;
|
||||
lock_buffer(bh);
|
||||
|
|
Loading…
Reference in New Issue