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

Commit 56b7103a authored by James Smart's avatar James Smart Committed by Jens Axboe
Browse files

nvme-fc: remove use of FC-specific error codes 



The FC-NVME transport used the FC-specific error codes in cases where
it had to fabricate an error to go back up stack. Instead of using the
FC-specific values, now use a generic value (NVME_SC_INTERNAL).

Signed-off-by: default avatarJames Smart <james.smart@broadcom.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent e5313c14

drivers/nvme/host/fc.c

+4 −4
Original line number Diff line number Diff line
@@ -1376,7 +1376,7 @@ nvme_fc_fcpio_done(struct nvmefc_fcp_req *req) 
	if (atomic_read(&op->state) == FCPOP_STATE_ABORTED)

		status = cpu_to_le16((NVME_SC_ABORT_REQ | NVME_SC_DNR) << 1);

	else if (freq->status)

		status = cpu_to_le16(NVME_SC_FC_TRANSPORT_ERROR << 1);

		status = cpu_to_le16(NVME_SC_INTERNAL << 1);



	/*

	 * For the linux implementation, if we have an unsuccesful
@@ -1404,7 +1404,7 @@ nvme_fc_fcpio_done(struct nvmefc_fcp_req *req) 
		 */

		if (freq->transferred_length !=

			be32_to_cpu(op->cmd_iu.data_len)) {

			status = cpu_to_le16(NVME_SC_FC_TRANSPORT_ERROR << 1);

			status = cpu_to_le16(NVME_SC_INTERNAL << 1);

			goto done;

		}

		result.u64 = 0;
@@ -1421,7 +1421,7 @@ nvme_fc_fcpio_done(struct nvmefc_fcp_req *req) 
					freq->transferred_length ||

			     op->rsp_iu.status_code ||

			     sqe->common.command_id != cqe->command_id)) {

			status = cpu_to_le16(NVME_SC_FC_TRANSPORT_ERROR << 1);

			status = cpu_to_le16(NVME_SC_INTERNAL << 1);

			goto done;

		}

		result = cqe->result;
@@ -1429,7 +1429,7 @@ nvme_fc_fcpio_done(struct nvmefc_fcp_req *req) 
		break;



	default:

		status = cpu_to_le16(NVME_SC_FC_TRANSPORT_ERROR << 1);

		status = cpu_to_le16(NVME_SC_INTERNAL << 1);

		goto done;

	}