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

Commit e392e1f1 authored by James Smart's avatar James Smart Committed by Christoph Hellwig
Browse files

nvme_fc: correct nvme status set on abort 



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: default avatarJames Smart <james.smart@broadcom.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 589ff775

drivers/nvme/host/fc.c

+2 −2
Original line number Diff line number Diff line
@@ -1372,9 +1372,9 @@ nvme_fc_fcpio_done(struct nvmefc_fcp_req *req) 
	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