Commit 3af13763 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds

[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: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4610a6be
...@@ -20,8 +20,6 @@ ...@@ -20,8 +20,6 @@
#include <linux/quotaops.h> #include <linux/quotaops.h>
#include <linux/buffer_head.h> #include <linux/buffer_head.h>
#include "bitmap.h"
/* /*
* balloc.c contains the blocks allocation and deallocation routines * balloc.c contains the blocks allocation and deallocation routines
*/ */
......
...@@ -7,8 +7,11 @@ ...@@ -7,8 +7,11 @@
* Universite Pierre et Marie Curie (Paris VI) * Universite Pierre et Marie Curie (Paris VI)
*/ */
#ifdef EXT3FS_DEBUG
#include <linux/buffer_head.h> #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}; 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) ...@@ -24,3 +27,6 @@ unsigned long ext3_count_free (struct buffer_head * map, unsigned int numchars)
nibblemap[(map->b_data[i] >> 4) & 0xf]; nibblemap[(map->b_data[i] >> 4) & 0xf];
return (sum); return (sum);
} }
#endif /* EXT3FS_DEBUG */
/* 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 );
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include "bitmap.h"
#include "xattr.h" #include "xattr.h"
#include "acl.h" #include "acl.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment