Commit 447286eb authored by Yangtao Li's avatar Yangtao Li Committed by Jaegeuk Kim
Browse files

f2fs: convert to use bitmap API 



Let's use BIT() and GENMASK() instead of open it.

Signed-off-by: default avatarYangtao Li <frank.li@vivo.com>
Reviewed-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 960fa2c8

fs/f2fs/checkpoint.c

+1 −1
Original line number Diff line number Diff line
@@ -982,7 +982,7 @@ int f2fs_get_valid_checkpoint(struct f2fs_sb_info *sbi) 


	cp_blk_no = le32_to_cpu(fsb->cp_blkaddr);

	if (cur_page == cp2)

		cp_blk_no += 1 << le32_to_cpu(fsb->log_blocks_per_seg);

		cp_blk_no += BIT(le32_to_cpu(fsb->log_blocks_per_seg));



	for (i = 1; i < cp_blks; i++) {

		void *sit_bitmap_ptr;

fs/f2fs/compress.c

+2 −2
Original line number Diff line number Diff line
@@ -670,7 +670,7 @@ static int f2fs_compress_pages(struct compress_ctx *cc) 


	cc->cbuf->clen = cpu_to_le32(cc->clen);



	if (fi->i_compress_flag & 1 << COMPRESS_CHKSUM)

	if (fi->i_compress_flag & BIT(COMPRESS_CHKSUM))

		chksum = f2fs_crc32(F2FS_I_SB(cc->inode),

					cc->cbuf->cdata, cc->clen);

	cc->cbuf->chksum = cpu_to_le32(chksum);
@@ -761,7 +761,7 @@ void f2fs_decompress_cluster(struct decompress_io_ctx *dic, bool in_task) 


	ret = cops->decompress_pages(dic);



	if (!ret && (fi->i_compress_flag & 1 << COMPRESS_CHKSUM)) {

	if (!ret && (fi->i_compress_flag & BIT(COMPRESS_CHKSUM))) {

		u32 provided = le32_to_cpu(dic->cbuf->chksum);

		u32 calculated = f2fs_crc32(sbi, dic->cbuf->cdata, dic->clen);

fs/f2fs/data.c

+6 −6
Original line number Diff line number Diff line
@@ -93,17 +93,17 @@ static enum count_type __read_io_type(struct page *page) 
/* postprocessing steps for read bios */

enum bio_post_read_step {

#ifdef CONFIG_FS_ENCRYPTION

	STEP_DECRYPT	= 1 << 0,

	STEP_DECRYPT	= BIT(0),

#else

	STEP_DECRYPT	= 0,	/* compile out the decryption-related code */

#endif

#ifdef CONFIG_F2FS_FS_COMPRESSION

	STEP_DECOMPRESS	= 1 << 1,

	STEP_DECOMPRESS	= BIT(1),

#else

	STEP_DECOMPRESS	= 0,	/* compile out the decompression-related code */

#endif

#ifdef CONFIG_FS_VERITY

	STEP_VERITY	= 1 << 2,

	STEP_VERITY	= BIT(2),

#else

	STEP_VERITY	= 0,	/* compile out the verity-related code */

#endif
@@ -420,7 +420,7 @@ int f2fs_target_device_index(struct f2fs_sb_info *sbi, block_t blkaddr) 


static blk_opf_t f2fs_io_flags(struct f2fs_io_info *fio)

{

	unsigned int temp_mask = (1 << NR_TEMP_TYPE) - 1;

	unsigned int temp_mask = GENMASK(NR_TEMP_TYPE - 1, 0);

	unsigned int fua_flag, meta_flag, io_flag;

	blk_opf_t op_flags = 0;
@@ -442,9 +442,9 @@ static blk_opf_t f2fs_io_flags(struct f2fs_io_info *fio) 
	 *    5 |    4 |   3 |    2 |    1 |   0 |

	 * Cold | Warm | Hot | Cold | Warm | Hot |

	 */

	if ((1 << fio->temp) & meta_flag)

	if (BIT(fio->temp) & meta_flag)

		op_flags |= REQ_META;

	if ((1 << fio->temp) & fua_flag)

	if (BIT(fio->temp) & fua_flag)

		op_flags |= REQ_FUA;

	return op_flags;

}

fs/f2fs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static unsigned long dir_blocks(struct inode *inode) 
static unsigned int dir_buckets(unsigned int level, int dir_level)

{

	if (level + dir_level < MAX_DIR_HASH_DEPTH / 2)

		return 1 << (level + dir_level);

		return BIT(level + dir_level);

	else

		return MAX_DIR_BUCKETS;

}

fs/f2fs/f2fs.h

+13 −13
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ enum { 
};



#ifdef CONFIG_F2FS_FAULT_INJECTION

#define F2FS_ALL_FAULT_TYPE		((1 << FAULT_MAX) - 1)

#define F2FS_ALL_FAULT_TYPE		(GENMASK(FAULT_MAX - 1, 0))



struct f2fs_fault_info {

	atomic_t inject_ops;
@@ -74,7 +74,7 @@ struct f2fs_fault_info { 
};



extern const char *f2fs_fault_name[FAULT_MAX];

#define IS_FAULT_SET(fi, type) ((fi)->inject_type & (1 << (type)))

#define IS_FAULT_SET(fi, type) ((fi)->inject_type & BIT(type))

#endif



/*
@@ -1436,7 +1436,7 @@ static inline void set_page_private_##name(struct page *page) \ 
static inline void clear_page_private_##name(struct page *page) \

{ \

	clear_bit(PAGE_PRIVATE_##flagname, &page_private(page)); \

	if (page_private(page) == 1 << PAGE_PRIVATE_NOT_POINTER) { \

	if (page_private(page) == BIT(PAGE_PRIVATE_NOT_POINTER)) { \

		set_page_private(page, 0); \

		if (PagePrivate(page)) { \

			ClearPagePrivate(page); \
@@ -1482,8 +1482,8 @@ static inline void set_page_private_data(struct page *page, unsigned long data) 


static inline void clear_page_private_data(struct page *page)

{

	page_private(page) &= (1 << PAGE_PRIVATE_MAX) - 1;

	if (page_private(page) == 1 << PAGE_PRIVATE_NOT_POINTER) {

	page_private(page) &= GENMASK(PAGE_PRIVATE_MAX - 1, 0);

	if (page_private(page) == BIT(PAGE_PRIVATE_NOT_POINTER)) {

		set_page_private(page, 0);

		if (PagePrivate(page)) {

			ClearPagePrivate(page);
@@ -2892,7 +2892,7 @@ static inline int f2fs_test_bit(unsigned int nr, char *addr) 
	int mask;



	addr += (nr >> 3);

	mask = 1 << (7 - (nr & 0x07));

	mask = BIT(7 - (nr & 0x07));

	return mask & *addr;

}
@@ -2901,7 +2901,7 @@ static inline void f2fs_set_bit(unsigned int nr, char *addr) 
	int mask;



	addr += (nr >> 3);

	mask = 1 << (7 - (nr & 0x07));

	mask = BIT(7 - (nr & 0x07));

	*addr |= mask;

}
@@ -2910,7 +2910,7 @@ static inline void f2fs_clear_bit(unsigned int nr, char *addr) 
	int mask;



	addr += (nr >> 3);

	mask = 1 << (7 - (nr & 0x07));

	mask = BIT(7 - (nr & 0x07));

	*addr &= ~mask;

}
@@ -2920,7 +2920,7 @@ static inline int f2fs_test_and_set_bit(unsigned int nr, char *addr) 
	int ret;



	addr += (nr >> 3);

	mask = 1 << (7 - (nr & 0x07));

	mask = BIT(7 - (nr & 0x07));

	ret = mask & *addr;

	*addr |= mask;

	return ret;
@@ -2932,7 +2932,7 @@ static inline int f2fs_test_and_clear_bit(unsigned int nr, char *addr) 
	int ret;



	addr += (nr >> 3);

	mask = 1 << (7 - (nr & 0x07));

	mask = BIT(7 - (nr & 0x07));

	ret = mask & *addr;

	*addr &= ~mask;

	return ret;
@@ -2943,7 +2943,7 @@ static inline void f2fs_change_bit(unsigned int nr, char *addr) 
	int mask;



	addr += (nr >> 3);

	mask = 1 << (7 - (nr & 0x07));

	mask = BIT(7 - (nr & 0x07));

	*addr ^= mask;

}
@@ -4353,9 +4353,9 @@ static inline int set_compress_context(struct inode *inode) 
			F2FS_OPTION(sbi).compress_log_size;

	F2FS_I(inode)->i_compress_flag =

			F2FS_OPTION(sbi).compress_chksum ?

				1 << COMPRESS_CHKSUM : 0;

				BIT(COMPRESS_CHKSUM) : 0;

	F2FS_I(inode)->i_cluster_size =

			1 << F2FS_I(inode)->i_log_cluster_size;

			BIT(F2FS_I(inode)->i_log_cluster_size);

	if ((F2FS_I(inode)->i_compress_algorithm == COMPRESS_LZ4 ||

		F2FS_I(inode)->i_compress_algorithm == COMPRESS_ZSTD) &&

			F2FS_OPTION(sbi).compress_level)