[PATCH] Make EXT2_DEBUG work again
This patch makes EXT2_DEBUG work again. Due to lack of proper include file, EXT2_DEBUG was undefined in bitmap.c and ext2_count_free() is left out. Moved to balloc.c and removed bitmap.c entirely. Second, debug versions of ext2_count_free_{inodes/blocks} reacquires superblock lock. Moved lock into callers. Signed-off-by: Val Henson <val_henson@linux.intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:

committed by
Linus Torvalds

parent
42225a359a
commit
21730eed11
@@ -638,6 +638,7 @@ fail:
|
||||
return ERR_PTR(err);
|
||||
}
|
||||
|
||||
/* Superblock must be locked */
|
||||
unsigned long ext2_count_free_inodes (struct super_block * sb)
|
||||
{
|
||||
struct ext2_group_desc *desc;
|
||||
@@ -649,7 +650,6 @@ unsigned long ext2_count_free_inodes (struct super_block * sb)
|
||||
unsigned long bitmap_count = 0;
|
||||
struct buffer_head *bitmap_bh = NULL;
|
||||
|
||||
lock_super (sb);
|
||||
es = EXT2_SB(sb)->s_es;
|
||||
for (i = 0; i < EXT2_SB(sb)->s_groups_count; i++) {
|
||||
unsigned x;
|
||||
@@ -672,7 +672,6 @@ unsigned long ext2_count_free_inodes (struct super_block * sb)
|
||||
printk("ext2_count_free_inodes: stored = %lu, computed = %lu, %lu\n",
|
||||
percpu_counter_read(&EXT2_SB(sb)->s_freeinodes_counter),
|
||||
desc_count, bitmap_count);
|
||||
unlock_super(sb);
|
||||
return desc_count;
|
||||
#else
|
||||
for (i = 0; i < EXT2_SB(sb)->s_groups_count; i++) {
|
||||
|
Reference in New Issue
Block a user