diff options
| author | Adrian Bunk <bunk@stusta.de> | 2006-01-09 20:54:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 08:01:56 -0800 |
| commit | 3af13763d696468d31f71a798155b33f681f221f (patch) | |
| tree | 7a4b68f956cedf415462929139df6dc5385ae25e | |
| parent | 4610a6bea7742ab34e40dcb776bd3feb52da10d6 (diff) | |
[PATCH] 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 <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | fs/ext3/balloc.c | 2 | ||||
| -rw-r--r-- | fs/ext3/bitmap.c | 8 | ||||
| -rw-r--r-- | fs/ext3/bitmap.h | 8 | ||||
| -rw-r--r-- | fs/ext3/ialloc.c | 1 |
4 files changed, 7 insertions, 12 deletions
diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c index ae1148c24c5..c6393fb4c35 100644 --- a/fs/ext3/balloc.c +++ b/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/fs/ext3/bitmap.c b/fs/ext3/bitmap.c index 5b4ba3e246e..cb16b4c5d5d 100644 --- a/fs/ext3/bitmap.c +++ b/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/fs/ext3/bitmap.h b/fs/ext3/bitmap.h deleted file mode 100644 index 6ee503a6bb4..00000000000 --- a/fs/ext3/bitmap.h +++ /dev/null @@ -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 --git a/fs/ext3/ialloc.c b/fs/ext3/ialloc.c index 69078079b19..dc826464f31 100644 --- a/fs/ext3/ialloc.c +++ b/fs/ext3/ialloc.c @@ -26,7 +26,6 @@ #include <asm/byteorder.h> -#include "bitmap.h" #include "xattr.h" #include "acl.h" |