Commit f26aaee6 authored by Yohan Joung's avatar Yohan Joung Committed by Jaegeuk Kim
Browse files

f2fs: fix align check for npo2 



Fix alignment check to be correct in npo2 as well

Signed-off-by: default avatarYohan Joung <yohan.joung@sk.com>
Reviewed-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent d4998b78

fs/f2fs/segment.c

+3 −2
Original line number Diff line number Diff line
@@ -1845,6 +1845,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);
@@ -1860,9 +1861,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);