Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[mirror_ubuntu-artful-kernel.git] / drivers / nvme / target / fc.c

diff --git a/drivers/nvme/target/fc.c b/drivers/nvme/target/fc.c
index ba57f9852bde33b0ff3d0655d4c08313632a3a8f..8f483ee7868c56bdc55e174f226f368609b32159 100644 (file)
--- a/drivers/nvme/target/fc.c
+++ b/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 */
                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;
        }
 
        switch (fcpreq->op) {
 
        case NVMET_FCOP_WRITEDATA:
-               if (abort || fcpreq->fcp_error ||
+               if (fcpreq->fcp_error ||
                    fcpreq->transferred_length != fcpreq->transfer_length) {
                        nvmet_req_complete(&fod->req,
                                        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_RSP:
-               if (abort || fcpreq->fcp_error ||
+               if (fcpreq->fcp_error ||
                    fcpreq->transferred_length != fcpreq->transfer_length) {
                        /* data no longer needed */
                        nvmet_fc_free_tgt_pgs(fod);