From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yunlei He Subject: [PATCH] resize.f2fs: fix an error in migrate_ssa Date: Thu, 24 Nov 2016 15:33:15 +0800 Message-ID: <20161124073315.26936-1-heyunlei@huawei.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from sog-mx-4.v43.ch3.sourceforge.com ([172.29.43.194] helo=mx.sourceforge.net) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1c9oQg-00080s-FC for linux-f2fs-devel@lists.sourceforge.net; Thu, 24 Nov 2016 07:26:46 +0000 Received: from szxga03-in.huawei.com ([119.145.14.66]) by sog-mx-4.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1c9oQZ-0003vB-S0 for linux-f2fs-devel@lists.sourceforge.net; Thu, 24 Nov 2016 07:26:46 +0000 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net To: linux-f2fs-devel@lists.sourceforge.net, jaegeuk@kernel.org, yuchao0@huawei.com This patch fix an error in migrate_ssa when resize with condition that offset is not zero && new_sum_blkaddr > old_sum_blkaddr + offset Signed-off-by: Yunlei He --- fsck/resize.c | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/fsck/resize.c b/fsck/resize.c index 46aa30e..70dbef5 100644 --- a/fsck/resize.c +++ b/fsck/resize.c @@ -208,28 +208,45 @@ static void migrate_ssa(struct f2fs_sb_info *sbi, block_t new_sum_blkaddr = get_newsb(ssa_blkaddr); block_t end_sum_blkaddr = get_newsb(main_blkaddr); block_t blkaddr; + unsigned int offset1 = offset; + int ret = 1; void *zero_block = calloc(BLOCK_SZ, 1); ASSERT(zero_block); - if (offset && new_sum_blkaddr < old_sum_blkaddr + offset) { - blkaddr = new_sum_blkaddr; - while (blkaddr < end_sum_blkaddr) { - if (blkaddr - new_sum_blkaddr < TOTAL_SEGS(sbi)) - move_ssa(sbi, offset, blkaddr); - else - dev_write_block(zero_block, blkaddr); - offset++; - blkaddr++; + if (offset) { + if (new_sum_blkaddr < old_sum_blkaddr + offset) { + blkaddr = new_sum_blkaddr; + while (blkaddr < end_sum_blkaddr) { + if (blkaddr - new_sum_blkaddr < TOTAL_SEGS(sbi) - offset1) + move_ssa(sbi, offset, blkaddr); + else + ret = dev_write_block(zero_block, blkaddr); + ASSERT(ret >= 0); + offset++; + blkaddr++; + } + } else { + blkaddr = end_sum_blkaddr - 1; + offset = TOTAL_SEGS(sbi)-1; + while (blkaddr >= new_sum_blkaddr) { + if (blkaddr >= TOTAL_SEGS(sbi) - offset1 + new_sum_blkaddr) + ret = dev_write_block(zero_block, blkaddr); + else + move_ssa(sbi, offset--, blkaddr); + ASSERT(ret >= 0); + blkaddr--; + } } } else { blkaddr = end_sum_blkaddr - 1; offset = TOTAL_SEGS(sbi) - 1; while (blkaddr >= new_sum_blkaddr) { if (blkaddr >= TOTAL_SEGS(sbi) + new_sum_blkaddr) - dev_write_block(zero_block, blkaddr); + ret = dev_write_block(zero_block, blkaddr); else move_ssa(sbi, offset--, blkaddr); + ASSERT(ret >= 0); blkaddr--; } } -- 2.10.1 ------------------------------------------------------------------------------