From: Daeho Jeong <daehojeong@google.com>
Do not finishing zones for current zones.
Signed-off-by: Daeho Jeong <daehojeong@google.com>
Fixes: 06a25b021d15 ("f2fs-tools: make six open zone check resilient")
---
fsck/fsck.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/fsck/fsck.c b/fsck/fsck.c
index 8acb822..5121a56 100644
--- a/fsck/fsck.c
+++ b/fsck/fsck.c
@@ -3265,8 +3265,9 @@ static int chk_and_fix_wp_with_sit(int UNUSED(i), void *blkzone, void *opaque)
struct f2fs_fsck *fsck = F2FS_FSCK(sbi);
block_t zone_block, wp_block, wp_blkoff;
unsigned int zone_segno, wp_segno;
- int ret, last_valid_blkoff;
+ int i, ret, last_valid_blkoff;
int log_sectors_per_block = sbi->log_blocksize - SECTOR_SHIFT;
+ unsigned int segs_per_zone = sbi->segs_per_sec * sbi->secs_per_zone;
if (blk_zone_conv(blkz))
return 0;
@@ -3309,6 +3310,15 @@ static int chk_and_fix_wp_with_sit(int UNUSED(i), void *blkzone, void *opaque)
return 0;
}
+ /* if a curseg points to the zone, do not finishing zone */
+ for (i = 0; i < NO_CHECK_TYPE; i++) {
+ struct curseg_info *cs = CURSEG_I(sbi, i);
+
+ if (zone_segno <= cs->segno &&
+ cs->segno < zone_segno + segs_per_zone)
+ return 0;
+ }
+
/*
* If valid blocks exist in the zone beyond the write pointer, it
* is a bug. No need to fix because the zone is not selected for the
--
2.43.0.rc2.451.g8631bc7472-goog