Commit bf9486d6 authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

fs/btrfs: Use the enum req_op and blk_opf_t types 



Improve static type checking by using the enum req_op type for variables
that represent a request operation and the new blk_opf_t type for
variables that represent request flags.

Acked-by: default avatarDavid Sterba <dsterba@suse.com>
Cc: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20220714180729.1065367-51-bvanassche@acm.org


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent f84c94af

fs/btrfs/check-integrity.c

+2 −2
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ struct btrfsic_block { 
	struct btrfsic_block *next_in_same_bio;

	void *orig_bio_private;

	bio_end_io_t *orig_bio_end_io;

	int submit_bio_bh_rw;

	blk_opf_t submit_bio_bh_rw;

	u64 flush_gen; /* only valid if !never_written */

};
@@ -1681,7 +1681,7 @@ static void btrfsic_process_written_block(struct btrfsic_dev_state *dev_state, 
					  u64 dev_bytenr, char **mapped_datav,

					  unsigned int num_pages,

					  struct bio *bio, int *bio_is_patched,

					  int submit_bio_bh_rw)

					  blk_opf_t submit_bio_bh_rw)

{

	int is_metadata;

	struct btrfsic_block *block;

fs/btrfs/compression.c

+3 −3
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ static blk_status_t submit_compressed_bio(struct btrfs_fs_info *fs_info, 




static struct bio *alloc_compressed_bio(struct compressed_bio *cb, u64 disk_bytenr,

					unsigned int opf, bio_end_io_t endio_func,

					blk_opf_t opf, bio_end_io_t endio_func,

					u64 *next_stripe_start)

{

	struct btrfs_fs_info *fs_info = btrfs_sb(cb->inode->i_sb);
@@ -505,7 +505,7 @@ blk_status_t btrfs_submit_compressed_write(struct btrfs_inode *inode, u64 start, 
				 unsigned int compressed_len,

				 struct page **compressed_pages,

				 unsigned int nr_pages,

				 unsigned int write_flags,

				 blk_opf_t write_flags,

				 struct cgroup_subsys_state *blkcg_css,

				 bool writeback)

{
@@ -517,7 +517,7 @@ blk_status_t btrfs_submit_compressed_write(struct btrfs_inode *inode, u64 start, 
	blk_status_t ret;

	int skip_sum = inode->flags & BTRFS_INODE_NODATASUM;

	const bool use_append = btrfs_use_zone_append(inode, disk_start);

	const unsigned int bio_op = use_append ? REQ_OP_ZONE_APPEND : REQ_OP_WRITE;

	const enum req_op bio_op = use_append ? REQ_OP_ZONE_APPEND : REQ_OP_WRITE;



	ASSERT(IS_ALIGNED(start, fs_info->sectorsize) &&

	       IS_ALIGNED(len, fs_info->sectorsize));

fs/btrfs/compression.h

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ blk_status_t btrfs_submit_compressed_write(struct btrfs_inode *inode, u64 start, 
				  unsigned int compressed_len,

				  struct page **compressed_pages,

				  unsigned int nr_pages,

				  unsigned int write_flags,

				  blk_opf_t write_flags,

				  struct cgroup_subsys_state *blkcg_css,

				  bool writeback);

void btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,

fs/btrfs/extent_io.c

+9 −9
Original line number Diff line number Diff line
@@ -3357,7 +3357,7 @@ static int calc_bio_boundaries(struct btrfs_bio_ctrl *bio_ctrl, 
static int alloc_new_bio(struct btrfs_inode *inode,

			 struct btrfs_bio_ctrl *bio_ctrl,

			 struct writeback_control *wbc,

			 unsigned int opf,

			 blk_opf_t opf,

			 bio_end_io_t end_io_func,

			 u64 disk_bytenr, u32 offset, u64 file_offset,

			 enum btrfs_compression_type compress_type)
@@ -3437,7 +3437,7 @@ static int alloc_new_bio(struct btrfs_inode *inode, 
 * @prev_bio_flags:  flags of previous bio to see if we can merge the current one

 * @compress_type:   compress type for current bio

 */

static int submit_extent_page(unsigned int opf,

static int submit_extent_page(blk_opf_t opf,

			      struct writeback_control *wbc,

			      struct btrfs_bio_ctrl *bio_ctrl,

			      struct page *page, u64 disk_bytenr,
@@ -3615,7 +3615,7 @@ __get_extent_map(struct inode *inode, struct page *page, size_t pg_offset, 
 */

static int btrfs_do_readpage(struct page *page, struct extent_map **em_cached,

		      struct btrfs_bio_ctrl *bio_ctrl,

		      unsigned int read_flags, u64 *prev_em_start)

		      blk_opf_t read_flags, u64 *prev_em_start)

{

	struct inode *inode = page->mapping->host;

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
@@ -3983,8 +3983,8 @@ static noinline_for_stack int __extent_writepage_io(struct btrfs_inode *inode, 
	int saved_ret = 0;

	int ret = 0;

	int nr = 0;

	u32 opf = REQ_OP_WRITE;

	const unsigned int write_flags = wbc_to_write_flags(wbc);

	enum req_op op = REQ_OP_WRITE;

	const blk_opf_t write_flags = wbc_to_write_flags(wbc);

	bool has_error = false;

	bool compressed;
@@ -4058,7 +4058,7 @@ static noinline_for_stack int __extent_writepage_io(struct btrfs_inode *inode, 
		iosize = min(min(em_end, end + 1), dirty_range_end) - cur;



		if (btrfs_use_zone_append(inode, em->block_start))

			opf = REQ_OP_ZONE_APPEND;

			op = REQ_OP_ZONE_APPEND;



		free_extent_map(em);

		em = NULL;
@@ -4094,7 +4094,7 @@ static noinline_for_stack int __extent_writepage_io(struct btrfs_inode *inode, 
		 */

		btrfs_page_clear_dirty(fs_info, page, cur, iosize);



		ret = submit_extent_page(opf | write_flags, wbc,

		ret = submit_extent_page(op | write_flags, wbc,

					 &epd->bio_ctrl, page,

					 disk_bytenr, iosize,

					 cur - page_offset(page),
@@ -4575,7 +4575,7 @@ static int write_one_subpage_eb(struct extent_buffer *eb, 
{

	struct btrfs_fs_info *fs_info = eb->fs_info;

	struct page *page = eb->pages[0];

	unsigned int write_flags = wbc_to_write_flags(wbc) | REQ_META;

	blk_opf_t write_flags = wbc_to_write_flags(wbc) | REQ_META;

	bool no_dirty_ebs = false;

	int ret;
@@ -4620,7 +4620,7 @@ static noinline_for_stack int write_one_eb(struct extent_buffer *eb, 
{

	u64 disk_bytenr = eb->start;

	int i, num_pages;

	unsigned int write_flags = wbc_to_write_flags(wbc) | REQ_META;

	blk_opf_t write_flags = wbc_to_write_flags(wbc) | REQ_META;

	int ret = 0;



	prepare_eb_write(eb);

fs/btrfs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ struct async_chunk { 
	struct page *locked_page;

	u64 start;

	u64 end;

	unsigned int write_flags;

	blk_opf_t write_flags;

	struct list_head extents;

	struct cgroup_subsys_state *blkcg_css;

	struct btrfs_work work;
@@ -1435,7 +1435,7 @@ static int cow_file_range_async(struct btrfs_inode *inode, 
	int i;

	bool should_compress;

	unsigned nofs_flag;

	const unsigned int write_flags = wbc_to_write_flags(wbc);

	const blk_opf_t write_flags = wbc_to_write_flags(wbc);



	unlock_extent(&inode->io_tree, start, end);