diff options
| author | Daeho Jeong <daehojeong@google.com> | 2023-05-31 10:52:13 -0700 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2023-06-07 09:57:22 -0700 |
| commit | 2f0705a02b7d7302f4e22a1a2b6ebf5e79d24019 (patch) | |
| tree | 11039b9433ca3587c7a9e465db650986a41c54e7 | |
| parent | 9d279316dd5cb2a1557a64dbd4483c27ccb7dff8 (diff) | |
| download | f2fs-tools-2f0705a02b7d7302f4e22a1a2b6ebf5e79d24019.tar.gz | |
f2fs-tools: remove power-of-two limitation of zoned device
Remove power-of-two limitation for zoned device, since zoned devices
don't have it.
Signed-off-by: Daeho Jeong <daehojeong@google.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| -rw-r--r-- | fsck/mount.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/fsck/mount.c b/fsck/mount.c index 7aaedaa..0310173 100644 --- a/fsck/mount.c +++ b/fsck/mount.c @@ -56,19 +56,17 @@ static int get_zone_idx_from_dev(struct f2fs_sb_info *sbi, { block_t seg_start_blkaddr = START_BLOCK(sbi, segno); - return (seg_start_blkaddr - c.devices[dev_idx].start_blkaddr) >> - log_base_2(sbi->segs_per_sec * sbi->blocks_per_seg); + return (seg_start_blkaddr - c.devices[dev_idx].start_blkaddr) / + (sbi->segs_per_sec * sbi->blocks_per_seg); } bool is_usable_seg(struct f2fs_sb_info *sbi, unsigned int segno) { - unsigned int secno = segno / sbi->segs_per_sec; block_t seg_start = START_BLOCK(sbi, segno); - block_t blocks_per_sec = sbi->blocks_per_seg * sbi->segs_per_sec; unsigned int dev_idx = get_device_idx(sbi, segno); unsigned int zone_idx = get_zone_idx_from_dev(sbi, segno, dev_idx); - unsigned int sec_off = SM_I(sbi)->main_blkaddr >> - log_base_2(blocks_per_sec); + unsigned int sec_start_blkaddr = START_BLOCK(sbi, + GET_SEG_FROM_SEC(sbi, segno / sbi->segs_per_sec)); if (zone_idx < c.devices[dev_idx].nr_rnd_zones) return true; @@ -76,7 +74,7 @@ bool is_usable_seg(struct f2fs_sb_info *sbi, unsigned int segno) if (c.devices[dev_idx].zoned_model != F2FS_ZONED_HM) return true; - return seg_start < ((sec_off + secno) * blocks_per_sec) + + return seg_start < sec_start_blkaddr + c.devices[dev_idx].zone_cap_blocks[zone_idx]; } |