fs/ext3/: small cleanups
PATCH 1/1 fs/ext3/: small cleanups
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 <[email protected]>
---
fs/ext3/balloc.c | 2 -- fs/ext3/bitmap.c | 8 +++++++- fs/ext3/bitmap.h | 8 -------- fs/ext3/ialloc.c | 1 - 4 files changed, 7 insertions(+), 12 deletions(-)
fs/ext3/bitmap.c renamed from fs/ext3/bitmap.c.old +7 -1
@@ -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 @@ nibblemap[(map->b_data[i] >>4 ) &0xf ]; return (sum); } + +#endif /* EXT3FS_DEBUG */ +
fs/ext3/balloc.c renamed from fs/ext3/balloc.c.old +0 -2
@@ -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 */
fs/ext3/ialloc.c renamed from fs/ext3/ialloc.c.old +0 -1
@@ -26,7 +26,6 @@#include <asm/byteorder.h> -#include "bitmap.h" #include "xattr.h" #include "acl.h"
fs/ext3/bitmap.h deleted +0 -8
@@ -1,8 +0,0 @@ -/* linux/fs/ext3/bitmap.c -* -* Copyright (C) 2005 Simtec Electronics -* Ben Dooks <[email protected]> -* -*/ - -extern unsigned long ext3_count_free (struct buffer_head *,unsigned int );