Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81c04b94 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

nvme: use an integer value to Linux errno values 



Use a separate integer variable to hold the signed Linux errno
values we pass back to the block layer.  Note that for pass through
commands those might still be NVMe values, but those fit into the
int as well.

Fixes: f4829a9b: ("blk-mq: fix racy updates of rq->errors")
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent f42d79ab

drivers/block/nvme-core.c

+7 −5
Original line number Diff line number Diff line
@@ -603,8 +603,8 @@ static void req_completion(struct nvme_queue *nvmeq, void *ctx, 
	struct nvme_iod *iod = ctx;

	struct request *req = iod_get_private(iod);

	struct nvme_cmd_info *cmd_rq = blk_mq_rq_to_pdu(req);



	u16 status = le16_to_cpup(&cqe->status) >> 1;

	int error = 0;



	if (unlikely(status)) {

		if (!(status & NVME_SC_DNR || blk_noretry_request(req))
@@ -621,9 +621,11 @@ static void req_completion(struct nvme_queue *nvmeq, void *ctx, 


		if (req->cmd_type == REQ_TYPE_DRV_PRIV) {

			if (cmd_rq->ctx == CMD_CTX_CANCELLED)

				status = -EINTR;

				error = -EINTR;

			else

				error = status;

		} else {

			status = nvme_error_status(status);

			error = nvme_error_status(status);

		}

	}
@@ -635,7 +637,7 @@ static void req_completion(struct nvme_queue *nvmeq, void *ctx, 
	if (cmd_rq->aborted)

		dev_warn(nvmeq->dev->dev,

			"completing aborted command with status:%04x\n",

			status);

			error);



	if (iod->nents) {

		dma_unmap_sg(nvmeq->dev->dev, iod->sg, iod->nents,
@@ -649,7 +651,7 @@ static void req_completion(struct nvme_queue *nvmeq, void *ctx, 
	}

	nvme_free_iod(nvmeq->dev, iod);



	blk_mq_complete_request(req, status);

	blk_mq_complete_request(req, error);

}



/* length is in bytes.  gfp flags indicates whether we may sleep. */