nvmet: stop using bio_set_op_attrs

bio_set_op_attrs has been long deprecated, replace it with a direct
assignment of the flags to bio->bi_opf.

Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/nvme/target/io-cmd-bdev.c b/drivers/nvme/target/io-cmd-bdev.c
index 07e4f8c..b6fca0e 100644 (file)
--- a/drivers/nvme/target/io-cmd-bdev.c
+++ b/drivers/nvme/target/io-cmd-bdev.c
@@ -149,7 +149,7 @@ static void nvmet_bdev_execute_rw(struct nvmet_req *req)
        struct scatterlist *sg;
        struct blk_plug plug;
        sector_t sector;
-       int op, op_flags = 0, i;
+       int op, i;
 
        if (!nvmet_check_data_len(req, nvmet_rw_len(req)))
                return;
@@ -160,16 +160,15 @@ static void nvmet_bdev_execute_rw(struct nvmet_req *req)
        }
 
        if (req->cmd->rw.opcode == nvme_cmd_write) {
-               op = REQ_OP_WRITE;
-               op_flags = REQ_SYNC | REQ_IDLE;
+               op = REQ_OP_WRITE | REQ_SYNC | REQ_IDLE;
                if (req->cmd->rw.control & cpu_to_le16(NVME_RW_FUA))
-                       op_flags |= REQ_FUA;
+                       op |= REQ_FUA;
        } else {
                op = REQ_OP_READ;
        }
 
        if (is_pci_p2pdma_page(sg_page(req->sg)))
-               op_flags |= REQ_NOMERGE;
+               op |= REQ_NOMERGE;
 
        sector = le64_to_cpu(req->cmd->rw.slba);
        sector <<= (req->ns->blksize_shift - 9);
@@ -184,7 +183,7 @@ static void nvmet_bdev_execute_rw(struct nvmet_req *req)
        bio->bi_iter.bi_sector = sector;
        bio->bi_private = req;
        bio->bi_end_io = nvmet_bio_done;
-       bio_set_op_attrs(bio, op, op_flags);
+       bio->bi_opf = op;
 
        blk_start_plug(&plug);
        for_each_sg(req->sg, sg, req->sg_cnt, i) {
@@ -195,7 +194,7 @@ static void nvmet_bdev_execute_rw(struct nvmet_req *req)
                        bio = bio_alloc(GFP_KERNEL, min(sg_cnt, BIO_MAX_PAGES));
                        bio_set_dev(bio, req->ns->bdev);
                        bio->bi_iter.bi_sector = sector;
-                       bio_set_op_attrs(bio, op, op_flags);
+                       bio->bi_opf = op;
 
                        bio_chain(bio, prev);
                        submit_bio(prev);