[PATCH] ext4: Use EXT4FS_DEBUG instead of EXT4_DEBUG in fsync.c

[PATCH] ext4: Use EXT4FS_DEBUG instead of EXT4_DEBUG in fsync.c

[Tao Ma]

From: Tao Ma <boyu.mt@taobao.com>

We have EXT4FS_DEBUG for some old debug and CONFIG_EXT4_DEBUG
for the new mballoc debug, but there isn't any EXT4_DEBUG.

As CONFIG_EXT4_DEBUG seems to be only used in mballoc, use
EXT4FS_DEBUG in fsync.c.

Signed-off-by: Tao Ma <boyu.mt@taobao.com>
---
 fs/ext4/fsync.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/ext4/fsync.c b/fs/ext4/fsync.c
index 7f74019..3278d6d 100644
--- a/fs/ext4/fsync.c
+++ b/fs/ext4/fsync.c
@@ -36,7 +36,7 @@
 
 static void dump_completed_IO(struct inode * inode)
 {
-#ifdef	EXT4_DEBUG
+#ifdef	EXT4FS_DEBUG
 	struct list_head *cur, *before, *after;
 	ext4_io_end_t *io, *io0, *io1;
 	unsigned long flags;
-- 
1.7.4

[PATCH] ext4: Use s_inodes_per_block directly in __ext4_get_inode_loc.

[Tao Ma]

From: Tao Ma <boyu.mt@taobao.com>

In __ext4_get_inode_loc, we calculate inodes_per_block every time
by EXT4_BLOCK_SIZE(sb) / EXT4_INODE_SIZE(sb). AFAICS, this function
is really a hot path for ext4, so we'd better use s_inodes_per_block
directly instead of calculating every time.

Signed-off-by: Tao Ma <boyu.mt@taobao.com>
---
 fs/ext4/inode.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 1a86282..326efd9 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -4605,7 +4605,7 @@ static int __ext4_get_inode_loc(struct inode *inode,
 	/*
 	 * Figure out the offset within the block group inode table
 	 */
-	inodes_per_block = (EXT4_BLOCK_SIZE(sb) / EXT4_INODE_SIZE(sb));
+	inodes_per_block = EXT4_SB(sb)->s_inodes_per_block;
 	inode_offset = ((inode->i_ino - 1) %
 			EXT4_INODES_PER_GROUP(sb));
 	block = ext4_inode_table(sb, gdp) + (inode_offset / inodes_per_block);
-- 
1.7.4

Re: [PATCH] ext4: Use EXT4FS_DEBUG instead of EXT4_DEBUG in fsync.c

[Ted Ts'o]

On Mon, Mar 28, 2011 at 11:41:12PM +0800, Tao Ma wrote:
> From: Tao Ma <boyu.mt@taobao.com>
> 
> We have EXT4FS_DEBUG for some old debug and CONFIG_EXT4_DEBUG
> for the new mballoc debug, but there isn't any EXT4_DEBUG.
> 
> As CONFIG_EXT4_DEBUG seems to be only used in mballoc, use
> EXT4FS_DEBUG in fsync.c.
> 
> Signed-off-by: Tao Ma <boyu.mt@taobao.com>

It doesn't really matter; although I'm including this patch in the
ext4 tree for consistency's sake.  The whole point of the #ifdef's is
to disable the debugging code.  In general you don't want to enable
all of the code protected by EXT4FS_DEBUG at the same time.

						- Ted

Re: [PATCH] ext4: Use s_inodes_per_block directly in __ext4_get_inode_loc.

[Ted Ts'o]

On Mon, Mar 28, 2011 at 11:41:13PM +0800, Tao Ma wrote:
> From: Tao Ma <boyu.mt@taobao.com>
> 
> In __ext4_get_inode_loc, we calculate inodes_per_block every time
> by EXT4_BLOCK_SIZE(sb) / EXT4_INODE_SIZE(sb). AFAICS, this function
> is really a hot path for ext4, so we'd better use s_inodes_per_block
> directly instead of calculating every time.
> 
> Signed-off-by: Tao Ma <boyu.mt@taobao.com>

Added to the ext4 tree, thanks.

						- Ted