Forráskód Böngészése

nvmet_fc: cleanup of abort flag processing in fcp_op_done

Cleanup of abort flag processing in fcp_op_done.
References were unnecessary

Signed-off-by: James Smart <james.smart@broadcom.com>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Jens Axboe <axboe@fb.com>
James Smart 8 éve
szülő
commit
f64935abbf
1 módosított fájl, 3 hozzáadás és 5 törlés
  1. 3 5
      drivers/nvme/target/fc.c

+ 3 - 5
drivers/nvme/target/fc.c

@@ -1817,16 +1817,14 @@ nvmet_fc_xmt_fcp_op_done(struct nvmefc_tgt_fcp_req *fcpreq)
 		/* data no longer needed */
 		/* data no longer needed */
 		nvmet_fc_free_tgt_pgs(fod);
 		nvmet_fc_free_tgt_pgs(fod);
 
 
-		if (fcpreq->fcp_error || abort)
-			nvmet_req_complete(&fod->req, fcpreq->fcp_error);
-
+		nvmet_req_complete(&fod->req, fcpreq->fcp_error);
 		return;
 		return;
 	}
 	}
 
 
 	switch (fcpreq->op) {
 	switch (fcpreq->op) {
 
 
 	case NVMET_FCOP_WRITEDATA:
 	case NVMET_FCOP_WRITEDATA:
-		if (abort || fcpreq->fcp_error ||
+		if (fcpreq->fcp_error ||
 		    fcpreq->transferred_length != fcpreq->transfer_length) {
 		    fcpreq->transferred_length != fcpreq->transfer_length) {
 			nvmet_req_complete(&fod->req,
 			nvmet_req_complete(&fod->req,
 					NVME_SC_FC_TRANSPORT_ERROR);
 					NVME_SC_FC_TRANSPORT_ERROR);
@@ -1849,7 +1847,7 @@ nvmet_fc_xmt_fcp_op_done(struct nvmefc_tgt_fcp_req *fcpreq)
 
 
 	case NVMET_FCOP_READDATA:
 	case NVMET_FCOP_READDATA:
 	case NVMET_FCOP_READDATA_RSP:
 	case NVMET_FCOP_READDATA_RSP:
-		if (abort || fcpreq->fcp_error ||
+		if (fcpreq->fcp_error ||
 		    fcpreq->transferred_length != fcpreq->transfer_length) {
 		    fcpreq->transferred_length != fcpreq->transfer_length) {
 			/* data no longer needed */
 			/* data no longer needed */
 			nvmet_fc_free_tgt_pgs(fod);
 			nvmet_fc_free_tgt_pgs(fod);