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

nvme/host: 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.

Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Keith Busch <kbusch@kernel.org>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20220714180729.1065367-38-bvanassche@acm.org


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

drivers/nvme/host/ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static struct request *nvme_alloc_user_request(struct request_queue *q, 
		struct nvme_command *cmd, void __user *ubuffer,

		unsigned bufflen, void __user *meta_buffer, unsigned meta_len,

		u32 meta_seed, void **metap, unsigned timeout, bool vec,

		unsigned int rq_flags, blk_mq_req_flags_t blk_flags)

		blk_opf_t rq_flags, blk_mq_req_flags_t blk_flags)

{

	bool write = nvme_is_write(cmd);

	struct nvme_ns *ns = q->queuedata;
@@ -407,7 +407,7 @@ static int nvme_uring_cmd_io(struct nvme_ctrl *ctrl, struct nvme_ns *ns, 
	struct nvme_uring_data d;

	struct nvme_command c;

	struct request *req;

	unsigned int rq_flags = 0;

	blk_opf_t rq_flags = 0;

	blk_mq_req_flags_t blk_flags = 0;

	void *meta = NULL;

drivers/nvme/host/nvme.h

+1 −1
Original line number Diff line number Diff line
@@ -733,7 +733,7 @@ void nvme_wait_freeze(struct nvme_ctrl *ctrl); 
int nvme_wait_freeze_timeout(struct nvme_ctrl *ctrl, long timeout);

void nvme_start_freeze(struct nvme_ctrl *ctrl);



static inline unsigned int nvme_req_op(struct nvme_command *cmd)

static inline enum req_op nvme_req_op(struct nvme_command *cmd)

{

	return nvme_is_write(cmd) ? REQ_OP_DRV_OUT : REQ_OP_DRV_IN;

}