NVMe: Fix obtaining command result

Replaces req->sense_len usage, which is not owned by the LLD, to
req->special to contain the command result for driver created commands,
and sets the result unconditionally on completion.

Signed-off-by: Keith Busch <keith.busch@intel.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Jens Axboe <axboe@fb.com>
Fixes: d29ec8241c10 ("nvme: submit internal commands through the block layer")
Signed-off-by: Jens Axboe <axboe@fb.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index 03bd638e76dd..c42bc53f3765 100644
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -606,13 +606,16 @@ static void req_completion(struct nvme_queue *nvmeq, void *ctx,
                         return;
                 }
                 if (req->cmd_type == REQ_TYPE_DRV_PRIV) {
-                        req->sense_len = le32_to_cpup(&cqe->result);
                         req->errors = status;
                 } else {
                         req->errors = nvme_error_status(status);
                 }
         } else
                 req->errors = 0;
+        if (req->cmd_type == REQ_TYPE_DRV_PRIV) {
+                u32 result = le32_to_cpup(&cqe->result);
+                req->special = (void *)(uintptr_t)result;
+        }
 
         if (cmd_rq->aborted)
                 dev_warn(nvmeq->dev->dev,
@@ -1015,8 +1018,7 @@ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,
 
         req->cmd = (unsigned char *)cmd;
         req->cmd_len = sizeof(struct nvme_command);
-        req->sense = NULL;
-        req->sense_len = 0;
+        req->special = (void *)0;
 
         if (buffer && bufflen) {
                 ret = blk_rq_map_kern(q, req, buffer, bufflen, __GFP_WAIT);
@@ -1033,7 +1035,7 @@ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,
         if (bio)
                 blk_rq_unmap_user(bio);
         if (result)
-                *result = req->sense_len;
+                *result = (u32)(uintptr_t)req->special;
         ret = req->errors;
  out:
         blk_mq_free_request(req);