aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext3
diff options
context:
space:
mode:
authorAkinobu Mita <akinobu.mita@gmail.com>2008-04-28 05:16:07 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-28 11:58:44 -0400
commit1eaafeae4b6f87eabdbabe3277826696f4ca196f (patch)
treef7fae185d2bb847f2fccdf50ee57a44a52675a34 /fs/ext3
parent15633005e07883b57c6c7ca539c32148c3a7f588 (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/ext3')
-rw-r--r--fs/ext3/super.c5
-rw-r--r--fs/ext3/xattr.c6
2 files changed, 4 insertions, 7 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index d7f242a93b7c..770bbb4fa58c 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,
1254static int ext3_check_descriptors(struct super_block *sb) 1254static int ext3_check_descriptors(struct super_block *sb)
1255{ 1255{
1256 struct ext3_sb_info *sbi = EXT3_SB(sb); 1256 struct ext3_sb_info *sbi = EXT3_SB(sb);
1257 ext3_fsblk_t first_block = le32_to_cpu(sbi->s_es->s_first_data_block);
1258 ext3_fsblk_t last_block;
1259 int i; 1257 int i;
1260 1258
1261 ext3_debug ("Checking group descriptors"); 1259 ext3_debug ("Checking group descriptors");
1262 1260
1263 for (i = 0; i < sbi->s_groups_count; i++) { 1261 for (i = 0; i < sbi->s_groups_count; i++) {
1264 struct ext3_group_desc *gdp = ext3_get_group_desc(sb, i, NULL); 1262 struct ext3_group_desc *gdp = ext3_get_group_desc(sb, i, NULL);
1263 ext3_fsblk_t first_block = ext3_group_first_block_no(sb, i);
1264 ext3_fsblk_t last_block;
1265 1265
1266 if (i == sbi->s_groups_count - 1) 1266 if (i == sbi->s_groups_count - 1)
1267 last_block = le32_to_cpu(sbi->s_es->s_blocks_count) - 1; 1267 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)
1300 le32_to_cpu(gdp->bg_inode_table)); 1300 le32_to_cpu(gdp->bg_inode_table));
1301 return 0; 1301 return 0;
1302 } 1302 }
1303 first_block += EXT3_BLOCKS_PER_GROUP(sb);
1304 } 1303 }
1305 1304
1306 sbi->s_es->s_free_blocks_count=cpu_to_le32(ext3_count_free_blocks(sb)); 1305 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 8516831709b8..ca591ad1540d 100644
--- a/fs/ext3/xattr.c
+++ b/fs/ext3/xattr.c
@@ -799,10 +799,8 @@ inserted:
799 get_bh(new_bh); 799 get_bh(new_bh);
800 } else { 800 } else {
801 /* We need to allocate a new block */ 801 /* We need to allocate a new block */
802 ext3_fsblk_t goal = le32_to_cpu( 802 ext3_fsblk_t goal = ext3_group_first_block_no(sb,
803 EXT3_SB(sb)->s_es->s_first_data_block) + 803 EXT3_I(inode)->i_block_group);
804 (ext3_fsblk_t)EXT3_I(inode)->i_block_group *
805 EXT3_BLOCKS_PER_GROUP(sb);
806 ext3_fsblk_t block = ext3_new_block(handle, inode, 804 ext3_fsblk_t block = ext3_new_block(handle, inode,
807 goal, &error); 805 goal, &error);
808 if (error) 806 if (error)