From: Jan Kara Subject: [PATCH 03/21] resize2fs: Use ext2fs_allocate_group_table2() Date: Wed, 26 Aug 2015 18:22:18 +0200 Message-ID: <1440606156-5754-4-git-send-email-jack@suse.com> References: <1440606156-5754-1-git-send-email-jack@suse.com> Cc: Ted Tso , "Darrick J. Wong" , Jan Kara To: linux-ext4@vger.kernel.org Return-path: Received: from mx2.suse.de ([195.135.220.15]:33529 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756928AbbHZQWv (ORCPT ); Wed, 26 Aug 2015 12:22:51 -0400 In-Reply-To: <1440606156-5754-1-git-send-email-jack@suse.com> Sender: linux-ext4-owner@vger.kernel.org List-ID: Signed-off-by: Jan Kara --- resize/resize2fs.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/resize/resize2fs.c b/resize/resize2fs.c index 041ff75029b2..df6fdf1de913 100644 --- a/resize/resize2fs.c +++ b/resize/resize2fs.c @@ -1482,8 +1482,10 @@ static errcode_t blocks_to_move(ext2_resize_t rfs) ext2fs_block_bitmap_loc(fs, i)) continue; - retval = ext2fs_allocate_group_table(fs, i, - rfs->reserve_blocks); + retval = ext2fs_allocate_group_table2(fs, i, + rfs->reserve_blocks, + EXT2FS_ALLOC_TABLE_UPDATE_STATS | + EXT2FS_ALLOC_TABLE_SET_BLOCK_BITMAP); if (retval) goto errout; @@ -1493,7 +1495,6 @@ static errcode_t blocks_to_move(ext2_resize_t rfs) */ if (ext2fs_block_bitmap_loc(old_fs, i) != (blk = ext2fs_block_bitmap_loc(fs, i))) { - ext2fs_block_alloc_stats2(fs, blk, +1); if (ext2fs_test_block_bitmap2(old_fs->block_map, blk) && !ext2fs_test_block_bitmap2(meta_bmap, blk)) ext2fs_mark_block_bitmap2(rfs->move_blocks, @@ -1501,7 +1502,6 @@ static errcode_t blocks_to_move(ext2_resize_t rfs) } if (ext2fs_inode_bitmap_loc(old_fs, i) != (blk = ext2fs_inode_bitmap_loc(fs, i))) { - ext2fs_block_alloc_stats2(fs, blk, +1); if (ext2fs_test_block_bitmap2(old_fs->block_map, blk) && !ext2fs_test_block_bitmap2(meta_bmap, blk)) ext2fs_mark_block_bitmap2(rfs->move_blocks, @@ -1527,7 +1527,6 @@ static errcode_t blocks_to_move(ext2_resize_t rfs) */ for (blk = ext2fs_inode_table_loc(fs, i), j=0; j < fs->inode_blocks_per_group ; j++, blk++) { - ext2fs_block_alloc_stats2(fs, blk, +1); if (ext2fs_test_block_bitmap2(old_fs->block_map, blk) && !ext2fs_test_block_bitmap2(meta_bmap, blk)) ext2fs_mark_block_bitmap2(rfs->move_blocks, -- 2.1.4