Commit cfe03c2e authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
parent 43e2d08d

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

+2 −4
Original line number Diff line number Diff line
@@ -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));

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE