Commit 2e2c6e9b authored Apr 17, 2023 by Jaegeuk Kim

f2fs: remove power-of-two limitation of zoned device



In f2fs, there's no reason to force po2.

Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

parent 55847850

fs/f2fs/f2fs.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -1523,7 +1523,6 @@ struct f2fs_sb_info {

		#ifdef CONFIG_BLK_DEV_ZONED
		unsigned int blocks_per_blkz; /* F2FS blocks per zone */
		unsigned int log_blocks_per_blkz; /* log2 F2FS blocks per zone */
		#endif

		/* for node-related operations */
		@@ -4390,7 +4389,7 @@ F2FS_FEATURE_FUNCS(readonly, RO);
		static inline bool f2fs_blkz_is_seq(struct f2fs_sb_info *sbi, int devi,
		block_t blkaddr)
		{
		unsigned int zno = blkaddr >> sbi->log_blocks_per_blkz;
		unsigned int zno = blkaddr / sbi->blocks_per_blkz;

		return test_bit(zno, FDEV(devi).blkz_seq);
		}

fs/f2fs/gc.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2093,8 +2093,8 @@ static void update_fs_metadata(struct f2fs_sb_info *sbi, int secs)
		FDEV(last_dev).end_blk =
		(long long)FDEV(last_dev).end_blk + blks;
		#ifdef CONFIG_BLK_DEV_ZONED
		FDEV(last_dev).nr_blkz = (int)FDEV(last_dev).nr_blkz +
		(int)(blks >> sbi->log_blocks_per_blkz);
		FDEV(last_dev).nr_blkz = FDEV(last_dev).nr_blkz +
		div_u64(blks, sbi->blocks_per_blkz);
		#endif
		}
		}

fs/f2fs/super.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -3806,12 +3806,8 @@ static int init_blkz_info(struct f2fs_sb_info *sbi, int devi)
		SECTOR_TO_BLOCK(zone_sectors))
		return -EINVAL;
		sbi->blocks_per_blkz = SECTOR_TO_BLOCK(zone_sectors);
		if (sbi->log_blocks_per_blkz && sbi->log_blocks_per_blkz !=
		__ilog2_u32(sbi->blocks_per_blkz))
		return -EINVAL;
		sbi->log_blocks_per_blkz = __ilog2_u32(sbi->blocks_per_blkz);
		FDEV(devi).nr_blkz = SECTOR_TO_BLOCK(nr_sectors) >>
		sbi->log_blocks_per_blkz;
		FDEV(devi).nr_blkz = div_u64(SECTOR_TO_BLOCK(nr_sectors),
		sbi->blocks_per_blkz);
		if (nr_sectors & (zone_sectors - 1))
		FDEV(devi).nr_blkz++;

fs/f2fs/segment.c

+1 −1

File changed.

Contains only whitespace changes.