Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 1eaafeae4b6f87eabdbabe3277826696f4ca196f

Authored by Akinobu Mita
Committed by Linus Torvalds
1 parent 15633005e0
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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>

Showing 2 changed files with 4 additions and 7 deletions Side-by-side Diff

... ... @@ -1254,14 +1254,14 @@
1254 1254 static int ext3_check_descriptors(struct super_block *sb)
1255 1255 {
1256 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 1257 int i;
1260 1258  
1261 1259 ext3_debug ("Checking group descriptors");
1262 1260  
1263 1261 for (i = 0; i < sbi->s_groups_count; i++) {
1264 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 1266 if (i == sbi->s_groups_count - 1)
1267 1267 last_block = le32_to_cpu(sbi->s_es->s_blocks_count) - 1;
... ... @@ -1300,7 +1300,6 @@
1300 1300 le32_to_cpu(gdp->bg_inode_table));
1301 1301 return 0;
1302 1302 }
1303   - first_block += EXT3_BLOCKS_PER_GROUP(sb);
1304 1303 }
1305 1304  
1306 1305 sbi->s_es->s_free_blocks_count=cpu_to_le32(ext3_count_free_blocks(sb));
... ... @@ -799,10 +799,8 @@
799 799 get_bh(new_bh);
800 800 } else {
801 801 /* We need to allocate a new block */
802   - ext3_fsblk_t goal = le32_to_cpu(
803   - EXT3_SB(sb)->s_es->s_first_data_block) +
804   - (ext3_fsblk_t)EXT3_I(inode)->i_block_group *
805   - EXT3_BLOCKS_PER_GROUP(sb);
  802 + ext3_fsblk_t goal = ext3_group_first_block_no(sb,
  803 + EXT3_I(inode)->i_block_group);
806 804 ext3_fsblk_t block = ext3_new_block(handle, inode,
807 805 goal, &error);
808 806 if (error)