nvme_fc: correct nvme status set on abort
authorJames Smart <jsmart2021@gmail.com>
Tue, 16 May 2017 00:10:24 +0000 (17:10 -0700)
committerChristoph Hellwig <hch@lst.de>
Mon, 22 May 2017 18:55:29 +0000 (20:55 +0200)
correct nvme status set on abort. Patch that changed status to being actual
nvme status crossed in the night with the patch that added abort values.

Signed-off-by: James Smart <james.smart@broadcom.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/nvme/host/fc.c

index e4817f9f4323c9545dafe173a803493ca7033373..775869c69df6be1e54c11da8d779d8950174b95e 100644 (file)
@@ -1372,9 +1372,9 @@ done:
        complete_rq = __nvme_fc_fcpop_chk_teardowns(ctrl, op);
        if (!complete_rq) {
                if (unlikely(op->flags & FCOP_FLAGS_TERMIO)) {
-                       status = cpu_to_le16(NVME_SC_ABORT_REQ);
+                       status = cpu_to_le16(NVME_SC_ABORT_REQ << 1);
                        if (blk_queue_dying(rq->q))
-                               status |= cpu_to_le16(NVME_SC_DNR);
+                               status |= cpu_to_le16(NVME_SC_DNR << 1);
                }
                nvme_end_request(rq, status, result);
        } else