[<prev] [next>] [day] [month] [year] [list]
Message-Id: <200804282200.m3SM0dXY018726@imap1.linux-foundation.org>
Date: Mon, 28 Apr 2008 15:00:39 -0700
From: akpm@...ux-foundation.org
To: akinobu.mita@...il.com, linux-ext4@...r.kernel.org,
mm-commits@...r.kernel.org
Subject: - ext3-use-ext3_get_group_desc.patch removed from -mm tree
The patch titled
ext3: use ext3_get_group_desc()
has been removed from the -mm tree. Its filename was
ext3-use-ext3_get_group_desc.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: ext3: use ext3_get_group_desc()
From: Akinobu Mita <akinobu.mita@...il.com>
Use ext3_get_group_desc()
Signed-off-by: Akinobu Mita <akinobu.mita@...il.com>
Cc: <linux-ext4@...r.kernel.org>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
---
fs/ext3/inode.c | 23 +++++------------------
1 file changed, 5 insertions(+), 18 deletions(-)
diff -puN fs/ext3/inode.c~ext3-use-ext3_get_group_desc fs/ext3/inode.c
--- a/fs/ext3/inode.c~ext3-use-ext3_get_group_desc
+++ a/fs/ext3/inode.c
@@ -2454,11 +2454,10 @@ out_stop:
static ext3_fsblk_t ext3_get_inode_block(struct super_block *sb,
unsigned long ino, struct ext3_iloc *iloc)
{
- unsigned long desc, group_desc, block_group;
+ unsigned long block_group;
unsigned long offset;
ext3_fsblk_t block;
- struct buffer_head *bh;
- struct ext3_group_desc * gdp;
+ struct ext3_group_desc *gdp;
if (!ext3_valid_inum(sb, ino)) {
/*
@@ -2470,27 +2469,15 @@ static ext3_fsblk_t ext3_get_inode_block
}
block_group = (ino - 1) / EXT3_INODES_PER_GROUP(sb);
- if (block_group >= EXT3_SB(sb)->s_groups_count) {
- ext3_error(sb,"ext3_get_inode_block","group >= groups count");
- return 0;
- }
- smp_rmb();
- group_desc = block_group >> EXT3_DESC_PER_BLOCK_BITS(sb);
- desc = block_group & (EXT3_DESC_PER_BLOCK(sb) - 1);
- bh = EXT3_SB(sb)->s_group_desc[group_desc];
- if (!bh) {
- ext3_error (sb, "ext3_get_inode_block",
- "Descriptor not loaded");
+ gdp = ext3_get_group_desc(sb, block_group, NULL);
+ if (!gdp)
return 0;
- }
-
- gdp = (struct ext3_group_desc *)bh->b_data;
/*
* Figure out the offset within the block group inode table
*/
offset = ((ino - 1) % EXT3_INODES_PER_GROUP(sb)) *
EXT3_INODE_SIZE(sb);
- block = le32_to_cpu(gdp[desc].bg_inode_table) +
+ block = le32_to_cpu(gdp->bg_inode_table) +
(offset >> EXT3_BLOCK_SIZE_BITS(sb));
iloc->block_group = block_group;
_
Patches currently in -mm which might be from akinobu.mita@...il.com are
origin.patch
idr-create-idr_layer_cache-at-boot-time.patch
idr-create-idr_layer_cache-at-boot-time-fix.patch
idr-create-idr_layer_cache-at-boot-time-fix-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists