|
@@ -605,7 +605,6 @@ handle_bb:
|
|
bh = bclean(handle, sb, block);
|
|
bh = bclean(handle, sb, block);
|
|
if (IS_ERR(bh)) {
|
|
if (IS_ERR(bh)) {
|
|
err = PTR_ERR(bh);
|
|
err = PTR_ERR(bh);
|
|
- bh = NULL;
|
|
|
|
goto out;
|
|
goto out;
|
|
}
|
|
}
|
|
overhead = ext4_group_overhead_blocks(sb, group);
|
|
overhead = ext4_group_overhead_blocks(sb, group);
|
|
@@ -618,9 +617,9 @@ handle_bb:
|
|
ext4_mark_bitmap_end(EXT4_B2C(sbi, group_data[i].blocks_count),
|
|
ext4_mark_bitmap_end(EXT4_B2C(sbi, group_data[i].blocks_count),
|
|
sb->s_blocksize * 8, bh->b_data);
|
|
sb->s_blocksize * 8, bh->b_data);
|
|
err = ext4_handle_dirty_metadata(handle, NULL, bh);
|
|
err = ext4_handle_dirty_metadata(handle, NULL, bh);
|
|
|
|
+ brelse(bh);
|
|
if (err)
|
|
if (err)
|
|
goto out;
|
|
goto out;
|
|
- brelse(bh);
|
|
|
|
|
|
|
|
handle_ib:
|
|
handle_ib:
|
|
if (bg_flags[i] & EXT4_BG_INODE_UNINIT)
|
|
if (bg_flags[i] & EXT4_BG_INODE_UNINIT)
|
|
@@ -635,18 +634,16 @@ handle_ib:
|
|
bh = bclean(handle, sb, block);
|
|
bh = bclean(handle, sb, block);
|
|
if (IS_ERR(bh)) {
|
|
if (IS_ERR(bh)) {
|
|
err = PTR_ERR(bh);
|
|
err = PTR_ERR(bh);
|
|
- bh = NULL;
|
|
|
|
goto out;
|
|
goto out;
|
|
}
|
|
}
|
|
|
|
|
|
ext4_mark_bitmap_end(EXT4_INODES_PER_GROUP(sb),
|
|
ext4_mark_bitmap_end(EXT4_INODES_PER_GROUP(sb),
|
|
sb->s_blocksize * 8, bh->b_data);
|
|
sb->s_blocksize * 8, bh->b_data);
|
|
err = ext4_handle_dirty_metadata(handle, NULL, bh);
|
|
err = ext4_handle_dirty_metadata(handle, NULL, bh);
|
|
|
|
+ brelse(bh);
|
|
if (err)
|
|
if (err)
|
|
goto out;
|
|
goto out;
|
|
- brelse(bh);
|
|
|
|
}
|
|
}
|
|
- bh = NULL;
|
|
|
|
|
|
|
|
/* Mark group tables in block bitmap */
|
|
/* Mark group tables in block bitmap */
|
|
for (j = 0; j < GROUP_TABLE_COUNT; j++) {
|
|
for (j = 0; j < GROUP_TABLE_COUNT; j++) {
|
|
@@ -685,7 +682,6 @@ handle_ib:
|
|
}
|
|
}
|
|
|
|
|
|
out:
|
|
out:
|
|
- brelse(bh);
|
|
|
|
err2 = ext4_journal_stop(handle);
|
|
err2 = ext4_journal_stop(handle);
|
|
if (err2 && !err)
|
|
if (err2 && !err)
|
|
err = err2;
|
|
err = err2;
|