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

treewide: Rename enum req_opf into enum req_op 



The type name enum req_opf is misleading since it suggests that values of
this type include both an operation type and flags. Since values of this
type represent an operation only, change the type name into enum req_op.

Convert the enum req_op documentation into kernel-doc format. Move a few
definitions such that the enum req_op documentation occurs just above
the enum req_op definition.

The name "req_opf" was introduced by commit ef295ecf ("block: better op
and flags encoding").

Cc: Christoph Hellwig <hch@lst.de>
Cc: Ming Lei <ming.lei@redhat.com>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Damien Le Moal <damien.lemoal@wdc.com>
Cc: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20220714180729.1065367-2-bvanassche@acm.org


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

block/blk-zoned.c

+3 −4
Original line number Diff line number Diff line
@@ -256,9 +256,8 @@ static int blkdev_zone_reset_all(struct block_device *bdev, gfp_t gfp_mask) 
 *    The operation to execute on each zone can be a zone reset, open, close

 *    or finish request.

 */

int blkdev_zone_mgmt(struct block_device *bdev, enum req_opf op,

		     sector_t sector, sector_t nr_sectors,

		     gfp_t gfp_mask)

int blkdev_zone_mgmt(struct block_device *bdev, enum req_op op,

		     sector_t sector, sector_t nr_sectors, gfp_t gfp_mask)

{

	struct request_queue *q = bdev_get_queue(bdev);

	sector_t zone_sectors = bdev_zone_sectors(bdev);
@@ -397,7 +396,7 @@ int blkdev_zone_mgmt_ioctl(struct block_device *bdev, fmode_t mode, 
	void __user *argp = (void __user *)arg;

	struct request_queue *q;

	struct blk_zone_range zrange;

	enum req_opf op;

	enum req_op op;

	int ret;



	if (!argp)

drivers/block/null_blk/main.c

+4 −5
Original line number Diff line number Diff line
@@ -1310,7 +1310,7 @@ static inline blk_status_t null_handle_badblocks(struct nullb_cmd *cmd, 
}



static inline blk_status_t null_handle_memory_backed(struct nullb_cmd *cmd,

						     enum req_opf op,

						     enum req_op op,

						     sector_t sector,

						     sector_t nr_sectors)

{
@@ -1381,9 +1381,8 @@ static inline void nullb_complete_cmd(struct nullb_cmd *cmd) 
	}

}



blk_status_t null_process_cmd(struct nullb_cmd *cmd,

			      enum req_opf op, sector_t sector,

			      unsigned int nr_sectors)

blk_status_t null_process_cmd(struct nullb_cmd *cmd, enum req_op op,

			      sector_t sector, unsigned int nr_sectors)

{

	struct nullb_device *dev = cmd->nq->dev;

	blk_status_t ret;
@@ -1401,7 +1400,7 @@ blk_status_t null_process_cmd(struct nullb_cmd *cmd, 
}



static blk_status_t null_handle_cmd(struct nullb_cmd *cmd, sector_t sector,

				    sector_t nr_sectors, enum req_opf op)

				    sector_t nr_sectors, enum req_op op)

{

	struct nullb_device *dev = cmd->nq->dev;

	struct nullb *nullb = dev->nullb;

drivers/block/null_blk/null_blk.h

+5 −7
Original line number Diff line number Diff line
@@ -136,9 +136,8 @@ struct nullb { 


blk_status_t null_handle_discard(struct nullb_device *dev, sector_t sector,

				 sector_t nr_sectors);

blk_status_t null_process_cmd(struct nullb_cmd *cmd,

			      enum req_opf op, sector_t sector,

			      unsigned int nr_sectors);

blk_status_t null_process_cmd(struct nullb_cmd *cmd, enum req_op op,

			      sector_t sector, unsigned int nr_sectors);



#ifdef CONFIG_BLK_DEV_ZONED

int null_init_zoned_dev(struct nullb_device *dev, struct request_queue *q);
@@ -146,9 +145,8 @@ int null_register_zoned_dev(struct nullb *nullb); 
void null_free_zoned_dev(struct nullb_device *dev);

int null_report_zones(struct gendisk *disk, sector_t sector,

		      unsigned int nr_zones, report_zones_cb cb, void *data);

blk_status_t null_process_zoned_cmd(struct nullb_cmd *cmd,

				    enum req_opf op, sector_t sector,

				    sector_t nr_sectors);

blk_status_t null_process_zoned_cmd(struct nullb_cmd *cmd, enum req_op op,

				    sector_t sector, sector_t nr_sectors);

size_t null_zone_valid_read_len(struct nullb *nullb,

				sector_t sector, unsigned int len);

#else
@@ -164,7 +162,7 @@ static inline int null_register_zoned_dev(struct nullb *nullb) 
}

static inline void null_free_zoned_dev(struct nullb_device *dev) {}

static inline blk_status_t null_process_zoned_cmd(struct nullb_cmd *cmd,

			enum req_opf op, sector_t sector, sector_t nr_sectors)

			enum req_op op, sector_t sector, sector_t nr_sectors)

{

	return BLK_STS_NOTSUPP;

}

drivers/block/null_blk/trace.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ TRACE_EVENT(nullb_zone_op, 
	    TP_ARGS(cmd, zone_no, zone_cond),

	    TP_STRUCT__entry(

		__array(char, disk, DISK_NAME_LEN)

		__field(enum req_opf, op)

		__field(enum req_op, op)

		__field(unsigned int, zone_no)

		__field(unsigned int, zone_cond)

	    ),

drivers/block/null_blk/zoned.c

+2 −2
Original line number Diff line number Diff line
@@ -600,7 +600,7 @@ static blk_status_t null_reset_zone(struct nullb_device *dev, 
	return BLK_STS_OK;

}



static blk_status_t null_zone_mgmt(struct nullb_cmd *cmd, enum req_opf op,

static blk_status_t null_zone_mgmt(struct nullb_cmd *cmd, enum req_op op,

				   sector_t sector)

{

	struct nullb_device *dev = cmd->nq->dev;
@@ -653,7 +653,7 @@ static blk_status_t null_zone_mgmt(struct nullb_cmd *cmd, enum req_opf op, 
	return ret;

}



blk_status_t null_process_zoned_cmd(struct nullb_cmd *cmd, enum req_opf op,

blk_status_t null_process_zoned_cmd(struct nullb_cmd *cmd, enum req_op op,

				    sector_t sector, sector_t nr_sectors)

{

	struct nullb_device *dev;