---

yaml --- r: 17682 b: refs/heads/master c: 3af1376 h: refs/heads/master v: v3
git-mirror · Jan 10, 2006 · 747f483 · 747f483
1 parent 3f36fb8
commit 747f483
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4610a6bea7742ab34e40dcb776bd3feb52da10d6
+refs/heads/master: 3af13763d696468d31f71a798155b33f681f221f
diff --git a/trunk/fs/ext3/balloc.c b/trunk/fs/ext3/balloc.c
@@ -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 --git a/trunk/fs/ext3/bitmap.c b/trunk/fs/ext3/bitmap.c
@@ -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 buffer_head * map, unsigned int numchars)
 			nibblemap[(map->b_data[i] >> 4) & 0xf];
 	return (sum);
 }
+
+#endif  /*  EXT3FS_DEBUG  */
+
diff --git a/trunk/fs/ext3/bitmap.h b/trunk/fs/ext3/bitmap.h
diff --git a/trunk/fs/ext3/ialloc.c b/trunk/fs/ext3/ialloc.c
@@ -26,7 +26,6 @@
 
 #include <asm/byteorder.h>
 
-#include "bitmap.h"
 #include "xattr.h"
 #include "acl.h"