nvmet: avoid double errno conversions

Use errno_to_nvme_status to convert from a negative errno to a
nvme status field instead of going through a blk_status_t.

Also remove the pointless status variable in
nvmet_bdev_execute_write_zeroes.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>

diff --git a/drivers/nvme/target/io-cmd-bdev.c b/drivers/nvme/target/io-cmd-bdev.c
index a065dbfc43b19895defa7788ce3b1858bb75739d..3efc52f9c309273d5e6d58396cb1f57790c09bac 100644 (file)
--- a/drivers/nvme/target/io-cmd-bdev.c
+++ b/drivers/nvme/target/io-cmd-bdev.c
@@ -196,7 +196,7 @@ static u16 nvmet_bdev_discard_range(struct nvmet_req *req,
                        GFP_KERNEL, 0, bio);
        if (ret && ret != -EOPNOTSUPP) {
                req->error_slba = le64_to_cpu(range->slba);
-               return blk_to_nvme_status(req, errno_to_blk_status(ret));
+               return errno_to_nvme_status(req, ret);
        }
        return NVME_SC_SUCCESS;
 }
@@ -252,7 +252,6 @@ static void nvmet_bdev_execute_write_zeroes(struct nvmet_req *req)
 {
        struct nvme_write_zeroes_cmd *write_zeroes = &req->cmd->write_zeroes;
        struct bio *bio = NULL;
-       u16 status = NVME_SC_SUCCESS;
        sector_t sector;
        sector_t nr_sector;
        int ret;
@@ -264,13 +263,12 @@ static void nvmet_bdev_execute_write_zeroes(struct nvmet_req *req)
 
        ret = __blkdev_issue_zeroout(req->ns->bdev, sector, nr_sector,
                        GFP_KERNEL, &bio, 0);
-       status = blk_to_nvme_status(req, errno_to_blk_status(ret));
        if (bio) {
                bio->bi_private = req;
                bio->bi_end_io = nvmet_bio_done;
                submit_bio(bio);
        } else {
-               nvmet_req_complete(req, status);
+               nvmet_req_complete(req, errno_to_nvme_status(req, ret));
        }
 }