Commit 21730eed authored by Valerie Henson's avatar Valerie Henson Committed by Linus Torvalds
Browse files

[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: default avatarVal Henson <val_henson@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 42225a35

fs/ext2/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


obj-$(CONFIG_EXT2_FS) += ext2.o



ext2-y := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \

ext2-y := balloc.o dir.o file.o fsync.o ialloc.o inode.o \

	  ioctl.o namei.o super.o symlink.o



ext2-$(CONFIG_EXT2_FS_XATTR)	 += xattr.o xattr_user.o xattr_trusted.o

fs/ext2/balloc.c

+20 −2
Original line number Diff line number Diff line
@@ -521,6 +521,26 @@ io_error: 
	goto out_release;

}



#ifdef EXT2FS_DEBUG



static int nibblemap[] = {4, 3, 3, 2, 3, 2, 2, 1, 3, 2, 2, 1, 2, 1, 1, 0};



unsigned long ext2_count_free (struct buffer_head * map, unsigned int numchars)

{

	unsigned int i;

	unsigned long sum = 0;



	if (!map)

		return (0);

	for (i = 0; i < numchars; i++)

		sum += nibblemap[map->b_data[i] & 0xf] +

			nibblemap[(map->b_data[i] >> 4) & 0xf];

	return (sum);

}



#endif  /*  EXT2FS_DEBUG  */



/* Superblock must be locked */

unsigned long ext2_count_free_blocks (struct super_block * sb)

{

	struct ext2_group_desc * desc;
@@ -530,7 +550,6 @@ unsigned long ext2_count_free_blocks (struct super_block * sb) 
	unsigned long bitmap_count, x;

	struct ext2_super_block *es;



	lock_super (sb);

	es = EXT2_SB(sb)->s_es;

	desc_count = 0;

	bitmap_count = 0;
@@ -554,7 +573,6 @@ unsigned long ext2_count_free_blocks (struct super_block * sb) 
	printk("ext2_count_free_blocks: stored = %lu, computed = %lu, %lu\n",

		(long)le32_to_cpu(es->s_free_blocks_count),

		desc_count, bitmap_count);

	unlock_super (sb);

	return bitmap_count;

#else

        for (i = 0; i < EXT2_SB(sb)->s_groups_count; i++) {

fs/ext2/bitmap.c

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
/*

 *  linux/fs/ext2/bitmap.c

 *

 * Copyright (C) 1992, 1993, 1994, 1995

 * Remy Card (card@masi.ibp.fr)

 * Laboratoire MASI - Institut Blaise Pascal

 * Universite Pierre et Marie Curie (Paris VI)

 */



#ifdef EXT2FS_DEBUG



#include <linux/buffer_head.h>



#include "ext2.h"



static int nibblemap[] = {4, 3, 3, 2, 3, 2, 2, 1, 3, 2, 2, 1, 2, 1, 1, 0};



unsigned long ext2_count_free (struct buffer_head * map, unsigned int numchars)

{

	unsigned int i;

	unsigned long sum = 0;

	

	if (!map) 

		return (0);

	for (i = 0; i < numchars; i++)

		sum += nibblemap[map->b_data[i] & 0xf] +

			nibblemap[(map->b_data[i] >> 4) & 0xf];

	return (sum);

}



#endif  /*  EXT2FS_DEBUG  */

fs/ext2/ialloc.c

+1 −2
Original line number Diff line number Diff line
@@ -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++) {

fs/ext2/super.c

+2 −0
Original line number Diff line number Diff line
@@ -1045,6 +1045,7 @@ static int ext2_statfs (struct dentry * dentry, struct kstatfs * buf) 
	unsigned long overhead;

	int i;



	lock_super(sb);

	if (test_opt (sb, MINIX_DF))

		overhead = 0;

	else {
@@ -1085,6 +1086,7 @@ static int ext2_statfs (struct dentry * dentry, struct kstatfs * buf) 
	buf->f_files = le32_to_cpu(sbi->s_es->s_inodes_count);

	buf->f_ffree = ext2_count_free_inodes (sb);

	buf->f_namelen = EXT2_NAME_LEN;

	unlock_super(sb);

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE