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

nvme/target: Use the new blk_opf_t type 



Improve static type checking by using the new blk_opf_t type for variables
that represent a request operation combined with request flags. Rename
those variables from 'op' into 'opf'.

Cc: Sagi Grimberg <sagi@grimberg.me>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Chaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20220714180729.1065367-39-bvanassche@acm.org


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

drivers/nvme/target/io-cmd-bdev.c

+9 −8
Original line number Diff line number Diff line
@@ -246,7 +246,8 @@ static void nvmet_bdev_execute_rw(struct nvmet_req *req) 
	struct scatterlist *sg;

	struct blk_plug plug;

	sector_t sector;

	int op, i, rc;

	blk_opf_t opf;

	int i, rc;

	struct sg_mapping_iter prot_miter;

	unsigned int iter_flags;

	unsigned int total_len = nvmet_rw_data_len(req) + req->metadata_len;
@@ -260,26 +261,26 @@ static void nvmet_bdev_execute_rw(struct nvmet_req *req) 
	}



	if (req->cmd->rw.opcode == nvme_cmd_write) {

		op = REQ_OP_WRITE | REQ_SYNC | REQ_IDLE;

		opf = REQ_OP_WRITE | REQ_SYNC | REQ_IDLE;

		if (req->cmd->rw.control & cpu_to_le16(NVME_RW_FUA))

			op |= REQ_FUA;

			opf |= REQ_FUA;

		iter_flags = SG_MITER_TO_SG;

	} else {

		op = REQ_OP_READ;

		opf = REQ_OP_READ;

		iter_flags = SG_MITER_FROM_SG;

	}



	if (is_pci_p2pdma_page(sg_page(req->sg)))

		op |= REQ_NOMERGE;

		opf |= REQ_NOMERGE;



	sector = nvmet_lba_to_sect(req->ns, req->cmd->rw.slba);



	if (nvmet_use_inline_bvec(req)) {

		bio = &req->b.inline_bio;

		bio_init(bio, req->ns->bdev, req->inline_bvec,

			 ARRAY_SIZE(req->inline_bvec), op);

			 ARRAY_SIZE(req->inline_bvec), opf);

	} else {

		bio = bio_alloc(req->ns->bdev, bio_max_segs(sg_cnt), op,

		bio = bio_alloc(req->ns->bdev, bio_max_segs(sg_cnt), opf,

				GFP_KERNEL);

	}

	bio->bi_iter.bi_sector = sector;
@@ -306,7 +307,7 @@ static void nvmet_bdev_execute_rw(struct nvmet_req *req) 
			}



			bio = bio_alloc(req->ns->bdev, bio_max_segs(sg_cnt),

					op, GFP_KERNEL);

					opf, GFP_KERNEL);

			bio->bi_iter.bi_sector = sector;



			bio_chain(bio, prev);

drivers/nvme/target/zns.c

+3 −3
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ static void nvmet_bdev_zone_append_bio_done(struct bio *bio) 
void nvmet_bdev_execute_zone_append(struct nvmet_req *req)

{

	sector_t sect = nvmet_lba_to_sect(req->ns, req->cmd->rw.slba);

	const unsigned int op = REQ_OP_ZONE_APPEND | REQ_SYNC | REQ_IDLE;

	const blk_opf_t opf = REQ_OP_ZONE_APPEND | REQ_SYNC | REQ_IDLE;

	u16 status = NVME_SC_SUCCESS;

	unsigned int total_len = 0;

	struct scatterlist *sg;
@@ -556,9 +556,9 @@ void nvmet_bdev_execute_zone_append(struct nvmet_req *req) 
	if (nvmet_use_inline_bvec(req)) {

		bio = &req->z.inline_bio;

		bio_init(bio, req->ns->bdev, req->inline_bvec,

			 ARRAY_SIZE(req->inline_bvec), op);

			 ARRAY_SIZE(req->inline_bvec), opf);

	} else {

		bio = bio_alloc(req->ns->bdev, req->sg_cnt, op, GFP_KERNEL);

		bio = bio_alloc(req->ns->bdev, req->sg_cnt, opf, GFP_KERNEL);

	}



	bio->bi_end_io = nvmet_bdev_zone_append_bio_done;