From: Adrian Bunk <bunk@stusta.de>

This patch contains the following cleanups:
- there's no need for ext3_count_free() #ifndef EXT3FS_DEBUG
- having prototypes for ext3_count_free() in two different headers is
  nonsense

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 dev/null         |    8 --------
 fs/ext3/balloc.c |    2 --
 fs/ext3/bitmap.c |    8 +++++++-
 fs/ext3/ialloc.c |    1 -
 4 files changed, 7 insertions(+), 12 deletions(-)

diff -puN fs/ext3/balloc.c~fs-ext3-small-cleanups fs/ext3/balloc.c
--- 25/fs/ext3/balloc.c~fs-ext3-small-cleanups	Fri Nov 18 15:58:37 2005
+++ 25-akpm/fs/ext3/balloc.c	Fri Nov 18 15:58:37 2005
@@ -20,8 +20,6 @@
 #include <linux/quotaops.h>
 #include <linux/buffer_head.h>
 
-#include "bitmap.h"
-
 /*
  * balloc.c contains the blocks allocation and deallocation routines
  */
diff -puN fs/ext3/bitmap.c~fs-ext3-small-cleanups fs/ext3/bitmap.c
--- 25/fs/ext3/bitmap.c~fs-ext3-small-cleanups	Fri Nov 18 15:58:37 2005
+++ 25-akpm/fs/ext3/bitmap.c	Fri Nov 18 15:58:37 2005
@@ -7,8 +7,11 @@
  * Universite Pierre et Marie Curie (Paris VI)
  */
 
+#ifdef EXT3FS_DEBUG
+
 #include <linux/buffer_head.h>
-#include "bitmap.h"
+
+#include "ext3_fs.h"
 
 static int nibblemap[] = {4, 3, 3, 2, 3, 2, 2, 1, 3, 2, 2, 1, 2, 1, 1, 0};
 
@@ -24,3 +27,6 @@ unsigned long ext3_count_free (struct bu
 			nibblemap[(map->b_data[i] >> 4) & 0xf];
 	return (sum);
 }
+
+#endif  /*  EXT3FS_DEBUG  */
+
diff -L fs/ext3/bitmap.h -puN fs/ext3/bitmap.h~fs-ext3-small-cleanups /dev/null
--- 25/fs/ext3/bitmap.h
+++ /dev/null	Thu Apr 11 07:25:15 2002
@@ -1,8 +0,0 @@
-/*  linux/fs/ext3/bitmap.c
- *
- * Copyright (C) 2005 Simtec Electronics
- *	Ben Dooks <ben@simtec.co.uk>
- *
-*/
-
-extern unsigned long ext3_count_free (struct buffer_head *, unsigned int );
diff -puN fs/ext3/ialloc.c~fs-ext3-small-cleanups fs/ext3/ialloc.c
--- 25/fs/ext3/ialloc.c~fs-ext3-small-cleanups	Fri Nov 18 15:58:37 2005
+++ 25-akpm/fs/ext3/ialloc.c	Fri Nov 18 15:58:37 2005
@@ -26,7 +26,6 @@
 
 #include <asm/byteorder.h>
 
-#include "bitmap.h"
 #include "xattr.h"
 #include "acl.h"
 
_