2023-05-31 18:00:29

by Daeho Jeong

Subject: [PATCH] f2fs-tools: remove power-of-two limitation of zoned device

From: Daeho Jeong <[email protected]>

Remove power-of-two limitation for zoned device, since zoned devices
don't have it.

Signed-off-by: Daeho Jeong <[email protected]>
---
fsck/mount.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/fsck/mount.c b/fsck/mount.c
index 4c74888..851a62b 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];
}

--
2.41.0.rc0.172.g3f132b7071-goog

2023-06-06 01:26:01

by Chao Yu

Subject: Re: [f2fs-dev] [PATCH] f2fs-tools: remove power-of-two limitation of zoned device

On 2023/6/1 1:52, Daeho Jeong wrote:
> From: Daeho Jeong <[email protected]>
>
> Remove power-of-two limitation for zoned device, since zoned devices
> don't have it.
>
> Signed-off-by: Daeho Jeong <[email protected]>

Reviewed-by: Chao Yu <[email protected]>

Thanks,