nvme: pass status to nvme_error_status
authorSagi Grimberg <sagi@grimberg.me>
Thu, 29 Aug 2019 19:53:15 +0000 (12:53 -0700)
committerSagi Grimberg <sagi@grimberg.me>
Thu, 12 Sep 2019 15:50:45 +0000 (08:50 -0700)
No need for the full blown request structure.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
drivers/nvme/host/core.c

index 066aeecca5d2126a2c009dbf87950d266331320f..2797d38d2dcad9343aafa06cd96390e6e055bffc 100644 (file)
@@ -197,9 +197,9 @@ static inline bool nvme_ns_has_pi(struct nvme_ns *ns)
        return ns->pi_type && ns->ms == sizeof(struct t10_pi_tuple);
 }
 
-static blk_status_t nvme_error_status(struct request *req)
+static blk_status_t nvme_error_status(u16 status)
 {
-       switch (nvme_req(req)->status & 0x7ff) {
+       switch (status & 0x7ff) {
        case NVME_SC_SUCCESS:
                return BLK_STS_OK;
        case NVME_SC_CAP_EXCEEDED:
@@ -262,7 +262,7 @@ static void nvme_retry_req(struct request *req)
 
 void nvme_complete_rq(struct request *req)
 {
-       blk_status_t status = nvme_error_status(req);
+       blk_status_t status = nvme_error_status(nvme_req(req)->status);
 
        trace_nvme_complete_rq(req);