| Message ID | 20230402031259.286-1-yohan.joung@sk.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 2aeb9c3b9a3c105217814a469a621644c5b30751 |
| Headers | show |
| Series | [f2fs-dev,v2] f2fs: fix align check for npo2 | expand |
On 2023/4/2 11:12, Yohan Joung wrote: > From: Yohan Joung <jyh429@gmail.com> > > Fix alignment check to be correct in npo2 as well > > Signed-off-by: Yohan Joung <yohan.joung@sk.com> Reviewed-by: Chao Yu <chao@kernel.org> Thanks,
Hello: This patch was applied to jaegeuk/f2fs.git (dev) by Jaegeuk Kim <jaegeuk@kernel.org>: On Sun, 2 Apr 2023 12:12:59 +0900 you wrote: > From: Yohan Joung <jyh429@gmail.com> > > Fix alignment check to be correct in npo2 as well > > Signed-off-by: Yohan Joung <yohan.joung@sk.com> > --- > fs/f2fs/segment.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) Here is the summary with links: - [f2fs-dev,v2] f2fs: fix align check for npo2 https://git.kernel.org/jaegeuk/f2fs/c/2aeb9c3b9a3c You are awesome, thank you!
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 055e70e77aa2..c1525168f265 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -1842,6 +1842,7 @@ static int __f2fs_issue_discard_zone(struct f2fs_sb_info *sbi, sector_t sector, nr_sects; block_t lblkstart = blkstart; int devi = 0; + u64 remainder = 0; if (f2fs_is_multi_device(sbi)) { devi = f2fs_target_device_index(sbi, blkstart); @@ -1857,9 +1858,9 @@ static int __f2fs_issue_discard_zone(struct f2fs_sb_info *sbi, if (f2fs_blkz_is_seq(sbi, devi, blkstart)) { sector = SECTOR_FROM_BLOCK(blkstart); nr_sects = SECTOR_FROM_BLOCK(blklen); + div64_u64_rem(sector, bdev_zone_sectors(bdev), &remainder); - if (sector & (bdev_zone_sectors(bdev) - 1) || - nr_sects != bdev_zone_sectors(bdev)) { + if (remainder || nr_sects != bdev_zone_sectors(bdev)) { f2fs_err(sbi, "(%d) %s: Unaligned zone reset attempted (block %x + %x)", devi, sbi->s_ndevs ? FDEV(devi).path : "", blkstart, blklen);