Skip to content

Commit

Permalink
[PATCH] fs/ext3/: small cleanups
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Adrian Bunk authored and Linus Torvalds committed Jan 10, 2006
1 parent 4610a6b commit 3af1376
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 12 deletions.
2 changes: 0 additions & 2 deletions fs/ext3/balloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
8 changes: 7 additions & 1 deletion fs/ext3/bitmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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};

Expand All @@ -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 */

8 changes: 0 additions & 8 deletions fs/ext3/bitmap.h

This file was deleted.

1 change: 0 additions & 1 deletion fs/ext3/ialloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

#include <asm/byteorder.h>

#include "bitmap.h"
#include "xattr.h"
#include "acl.h"

Expand Down

0 comments on commit 3af1376

Please sign in to comment.