Commit 581251e0 authored by Yongpeng Yang's avatar Yongpeng Yang Committed by Jaegeuk Kim
Browse files

f2fs: wrap all unusable_blocks_per_sec code in CONFIG_BLK_DEV_ZONED 



The usage of unusable_blocks_per_sec is already wrapped by
CONFIG_BLK_DEV_ZONED, except for its declaration and the definitions of
CAP_BLKS_PER_SEC and CAP_SEGS_PER_SEC. This patch ensures that all code
related to unusable_blocks_per_sec is properly wrapped under the
CONFIG_BLK_DEV_ZONED option.

Signed-off-by: default avatarYongpeng Yang <yangyongpeng@xiaomi.com>
Reviewed-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 24fd7f00

fs/f2fs/f2fs.h

+1 −1
Original line number Diff line number Diff line
@@ -1669,6 +1669,7 @@ struct f2fs_sb_info { 


#ifdef CONFIG_BLK_DEV_ZONED

	unsigned int blocks_per_blkz;		/* F2FS blocks per zone */

	unsigned int unusable_blocks_per_sec;   /* unusable blocks per section */

	unsigned int max_open_zones;		/* max open zone resources of the zoned device */

	/* For adjust the priority writing position of data in zone UFS */

	unsigned int blkzone_alloc_policy;
@@ -1741,7 +1742,6 @@ struct f2fs_sb_info { 
	unsigned int meta_ino_num;		/* meta inode number*/

	unsigned int log_blocks_per_seg;	/* log2 blocks per segment */

	unsigned int blocks_per_seg;		/* blocks per segment */

	unsigned int unusable_blocks_per_sec;	/* unusable blocks per section */

	unsigned int segs_per_sec;		/* segments per section */

	unsigned int secs_per_zone;		/* sections per zone */

	unsigned int total_sections;		/* total section count */

fs/f2fs/segment.h

+5 −0
Original line number Diff line number Diff line
@@ -69,11 +69,16 @@ static inline void sanity_check_seg_type(struct f2fs_sb_info *sbi, 
	((!__is_valid_data_blkaddr(blk_addr)) ?			\

	NULL_SEGNO : GET_L2R_SEGNO(FREE_I(sbi),			\

		GET_SEGNO_FROM_SEG0(sbi, blk_addr)))

#ifdef CONFIG_BLK_DEV_ZONED

#define CAP_BLKS_PER_SEC(sbi)					\

	(BLKS_PER_SEC(sbi) - (sbi)->unusable_blocks_per_sec)

#define CAP_SEGS_PER_SEC(sbi)					\

	(SEGS_PER_SEC(sbi) -					\

	BLKS_TO_SEGS(sbi, (sbi)->unusable_blocks_per_sec))

#else

#define CAP_BLKS_PER_SEC(sbi) BLKS_PER_SEC(sbi)

#define CAP_SEGS_PER_SEC(sbi) SEGS_PER_SEC(sbi)

#endif

#define GET_START_SEG_FROM_SEC(sbi, segno)			\

	(rounddown(segno, SEGS_PER_SEC(sbi)))

#define GET_SEC_FROM_SEG(sbi, segno)				\