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

Commit 29b3d26e authored by James Smart's avatar James Smart Committed by Jens Axboe
Browse files

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



The FC-NVME target transport used the FC-specific error codes in
return codes when the transport or lldd failed. 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 56b7103a

drivers/nvme/target/fc.c

+3 −6
Original line number Diff line number Diff line
@@ -1910,8 +1910,7 @@ nvmet_fc_transfer_fcp_data(struct nvmet_fc_tgtport *tgtport, 
			spin_lock_irqsave(&fod->flock, flags);

			fod->writedataactive = false;

			spin_unlock_irqrestore(&fod->flock, flags);

			nvmet_req_complete(&fod->req,

					NVME_SC_FC_TRANSPORT_ERROR);

			nvmet_req_complete(&fod->req, NVME_SC_INTERNAL);

		} else /* NVMET_FCOP_READDATA or NVMET_FCOP_READDATA_RSP */ {

			fcpreq->fcp_error = ret;

			fcpreq->transferred_length = 0;
@@ -1929,8 +1928,7 @@ __nvmet_fc_fod_op_abort(struct nvmet_fc_fcp_iod *fod, bool abort) 
	/* if in the middle of an io and we need to tear down */

	if (abort) {

		if (fcpreq->op == NVMET_FCOP_WRITEDATA) {

			nvmet_req_complete(&fod->req,

					NVME_SC_FC_TRANSPORT_ERROR);

			nvmet_req_complete(&fod->req, NVME_SC_INTERNAL);

			return true;

		}
@@ -1968,8 +1966,7 @@ nvmet_fc_fod_op_done(struct nvmet_fc_fcp_iod *fod) 
			fod->abort = true;

			spin_unlock(&fod->flock);



			nvmet_req_complete(&fod->req,

					NVME_SC_FC_TRANSPORT_ERROR);

			nvmet_req_complete(&fod->req, NVME_SC_INTERNAL);

			return;

		}