diff options
| author | Akinobu Mita <akinobu.mita@gmail.com> | 2008-04-28 02:16:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 08:58:44 -0700 |
| commit | 1eaafeae4b6f87eabdbabe3277826696f4ca196f (patch) | |
| tree | f7fae185d2bb847f2fccdf50ee57a44a52675a34 /fs | |
| parent | 15633005e07883b57c6c7ca539c32148c3a7f588 (diff) | |
ext3: use ext3_group_first_block_no()
Use ext3_group_first_block_no()
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext3/super.c | 5 | ||||
| -rw-r--r-- | fs/ext3/xattr.c | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c index d7f242a93b7..770bbb4fa58 100644 --- a/fs/ext3/super.c +++ b/fs/ext3/super.c @@ -1254,14 +1254,14 @@ static int ext3_setup_super(struct super_block *sb, struct ext3_super_block *es, 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; @@ -1300,7 +1300,6 @@ static int ext3_check_descriptors(struct super_block *sb) 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)); diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c index 8516831709b..ca591ad1540 100644 --- a/fs/ext3/xattr.c +++ b/fs/ext3/xattr.c @@ -799,10 +799,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) |