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

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
...@@ -1910,8 +1910,7 @@ nvmet_fc_transfer_fcp_data(struct nvmet_fc_tgtport *tgtport, ...@@ -1910,8 +1910,7 @@ nvmet_fc_transfer_fcp_data(struct nvmet_fc_tgtport *tgtport,
spin_lock_irqsave(&fod->flock, flags); spin_lock_irqsave(&fod->flock, flags);
fod->writedataactive = false; fod->writedataactive = false;
spin_unlock_irqrestore(&fod->flock, flags); spin_unlock_irqrestore(&fod->flock, flags);
nvmet_req_complete(&fod->req, nvmet_req_complete(&fod->req, NVME_SC_INTERNAL);
NVME_SC_FC_TRANSPORT_ERROR);
} else /* NVMET_FCOP_READDATA or NVMET_FCOP_READDATA_RSP */ { } else /* NVMET_FCOP_READDATA or NVMET_FCOP_READDATA_RSP */ {
fcpreq->fcp_error = ret; fcpreq->fcp_error = ret;
fcpreq->transferred_length = 0; fcpreq->transferred_length = 0;
...@@ -1929,8 +1928,7 @@ __nvmet_fc_fod_op_abort(struct nvmet_fc_fcp_iod *fod, bool abort) ...@@ -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 in the middle of an io and we need to tear down */
if (abort) { if (abort) {
if (fcpreq->op == NVMET_FCOP_WRITEDATA) { if (fcpreq->op == NVMET_FCOP_WRITEDATA) {
nvmet_req_complete(&fod->req, nvmet_req_complete(&fod->req, NVME_SC_INTERNAL);
NVME_SC_FC_TRANSPORT_ERROR);
return true; return true;
} }
...@@ -1968,8 +1966,7 @@ nvmet_fc_fod_op_done(struct nvmet_fc_fcp_iod *fod) ...@@ -1968,8 +1966,7 @@ nvmet_fc_fod_op_done(struct nvmet_fc_fcp_iod *fod)
fod->abort = true; fod->abort = true;
spin_unlock(&fod->flock); spin_unlock(&fod->flock);
nvmet_req_complete(&fod->req, nvmet_req_complete(&fod->req, NVME_SC_INTERNAL);
NVME_SC_FC_TRANSPORT_ERROR);
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment