From: Adrian Bunk <bunk@stusta.de>
To: sct@redhat.com, akpm@osdl.org, adilger@clusterfs.com
Cc: ext3-users@redhat.com, linux-kernel@vger.kernel.org
Subject: [2.6 patch] fs/ext3/: small cleanups
Date: Fri, 18 Nov 2005 04:34:00 +0100 [thread overview]
Message-ID: <20051118033359.GX11494@stusta.de> (raw)
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>
---
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(-)
--- linux-2.6.15-rc1-mm1-full/fs/ext3/bitmap.c.old 2005-11-18 02:52:02.000000000 +0100
+++ linux-2.6.15-rc1-mm1-full/fs/ext3/bitmap.c 2005-11-18 02:54:14.000000000 +0100
@@ -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 */
+
--- linux-2.6.15-rc1-mm1-full/fs/ext3/balloc.c.old 2005-11-18 02:52:55.000000000 +0100
+++ linux-2.6.15-rc1-mm1-full/fs/ext3/balloc.c 2005-11-18 02:53:02.000000000 +0100
@@ -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
*/
--- linux-2.6.15-rc1-mm1-full/fs/ext3/ialloc.c.old 2005-11-18 02:53:26.000000000 +0100
+++ linux-2.6.15-rc1-mm1-full/fs/ext3/ialloc.c 2005-11-18 02:53:31.000000000 +0100
@@ -26,7 +26,6 @@
#include <asm/byteorder.h>
-#include "bitmap.h"
#include "xattr.h"
#include "acl.h"
--- linux-2.6.15-rc1-mm1-full/fs/ext3/bitmap.h 2005-11-17 21:30:48.000000000 +0100
+++ /dev/null 2005-11-08 19:07:57.000000000 +0100
@@ -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 );
reply other threads:[~2005-11-18 3:34 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20051118033359.GX11494@stusta.de \
--to=bunk@stusta.de \
--cc=adilger@clusterfs.com \
--cc=akpm@osdl.org \
--cc=ext3-users@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sct@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox