Use ext3_group_first_block_no()
Signed-off-by: Akinobu Mita <[EMAIL PROTECTED]>
Cc: Andrew Morton <[EMAIL PROTECTED]>
Cc: Stephen Tweedie <[EMAIL PROTECTED]>
Cc: [EMAIL PROTECTED]
---
fs/ext3/super.c | 5 ++---
fs/ext3/xattr.c | 6 ++----
2 files changed, 4 insertions(+), 7 deletions(-)
Index: 2.6-rc/fs/ext3/super.c
===================================================================
--- 2.6-rc.orig/fs/ext3/super.c
+++ 2.6-rc/fs/ext3/super.c
@@ -1253,14 +1253,14 @@ static int ext3_setup_super(struct super
static int ext3_check_descriptors(struct super_block *sb)
{
struct ext3_sb_info *sbi = EXT3_SB(sb);
- ext3_fsblk_t first_block = le32_to_cpu(sbi->s_es->s_first_data_block);
- ext3_fsblk_t last_block;
int i;
ext3_debug ("Checking group descriptors");
for (i = 0; i < sbi->s_groups_count; i++) {
struct ext3_group_desc *gdp = ext3_get_group_desc(sb, i, NULL);
+ ext3_fsblk_t first_block = ext3_group_first_block_no(sb, i);
+ ext3_fsblk_t last_block;
if (i == sbi->s_groups_count - 1)
last_block = le32_to_cpu(sbi->s_es->s_blocks_count) - 1;
@@ -1299,7 +1299,6 @@ static int ext3_check_descriptors(struct
le32_to_cpu(gdp->bg_inode_table));
return 0;
}
- first_block += EXT3_BLOCKS_PER_GROUP(sb);
}
sbi->s_es->s_free_blocks_count=cpu_to_le32(ext3_count_free_blocks(sb));
Index: 2.6-rc/fs/ext3/xattr.c
===================================================================
--- 2.6-rc.orig/fs/ext3/xattr.c
+++ 2.6-rc/fs/ext3/xattr.c
@@ -797,10 +797,8 @@ inserted:
get_bh(new_bh);
} else {
/* We need to allocate a new block */
- ext3_fsblk_t goal = le32_to_cpu(
- EXT3_SB(sb)->s_es->s_first_data_block) +
- (ext3_fsblk_t)EXT3_I(inode)->i_block_group *
- EXT3_BLOCKS_PER_GROUP(sb);
+ ext3_fsblk_t goal = ext3_group_first_block_no(sb,
+ EXT3_I(inode)->i_block_group);
ext3_fsblk_t block = ext3_new_block(handle, inode,
goal, &error);
if (error)
-
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
