3 files changed, 11 insertions, 2 deletions

diff --git a/drivers/target/tcm_fc/tcm_fc.h b/drivers/target/tcm_fc/tcm_fc.h
index 830657908db8..c5eb3c33c3db 100644
--- a/drivers/target/tcm_fc/tcm_fc.h
+++ b/drivers/target/tcm_fc/tcm_fc.h
@@ -122,6 +122,7 @@ struct ft_cmd {
         /* Local sense buffer */
         unsigned char ft_sense_buffer[TRANSPORT_SENSE_BUFFER];
         u32 was_ddp_setup:1;            /* Set only if ddp is setup */
+        u32 aborted:1;                  /* Set if aborted by reset or timeout */
         struct scatterlist *sg;         /* Set only if DDP is setup */
         u32 sg_cnt;                     /* No. of item in scatterlist */
 };
diff --git a/drivers/target/tcm_fc/tfc_cmd.c b/drivers/target/tcm_fc/tfc_cmd.c
index 62dec9715ce5..a375f257aabc 100644
--- a/drivers/target/tcm_fc/tfc_cmd.c
+++ b/drivers/target/tcm_fc/tfc_cmd.c
@@ -121,6 +121,8 @@ int ft_queue_status(struct se_cmd *se_cmd)
         struct fc_exch *ep;
         size_t len;
 
+        if (cmd->aborted)
+                return 0;
         ft_dump_cmd(cmd, __func__);
         ep = fc_seq_exch(cmd->seq);
         lport = ep->lp;
@@ -187,6 +189,8 @@ int ft_write_pending(struct se_cmd *se_cmd)
 
         ft_dump_cmd(cmd, __func__);
 
+        if (cmd->aborted)
+                return 0;
         ep = fc_seq_exch(cmd->seq);
         lport = ep->lp;
         fp = fc_frame_alloc(lport, sizeof(*txrdy));
@@ -252,10 +256,10 @@ static void ft_recv_seq(struct fc_seq *sp, struct fc_frame *fp, void *arg)
         struct ft_cmd *cmd = arg;
         struct fc_frame_header *fh;
 
-        if (IS_ERR(fp)) {
+        if (unlikely(IS_ERR(fp))) {
                 /* XXX need to find cmd if queued */
                 cmd->seq = NULL;
-                transport_generic_free_cmd(&cmd->se_cmd, 0);
+                cmd->aborted = true;
                 return;
         }
 
@@ -399,6 +403,8 @@ int ft_queue_tm_resp(struct se_cmd *se_cmd)
         struct se_tmr_req *tmr = se_cmd->se_tmr_req;
         enum fcp_resp_rsp_codes code;
 
+        if (cmd->aborted)
+                return 0;
         switch (tmr->response) {
         case TMR_FUNCTION_COMPLETE:
                 code = FCP_TMF_CMPL;
diff --git a/drivers/target/tcm_fc/tfc_io.c b/drivers/target/tcm_fc/tfc_io.c
index 2b693eefac55..dc7c0db26e20 100644
--- a/drivers/target/tcm_fc/tfc_io.c
+++ b/drivers/target/tcm_fc/tfc_io.c
@@ -81,6 +81,8 @@ int ft_queue_data_in(struct se_cmd *se_cmd)
         void *from;
         void *to = NULL;
 
+        if (cmd->aborted)
+                return 0;
         ep = fc_seq_exch(cmd->seq);
         lport = ep->lp;
         cmd->seq = lport->tt.seq_start_next(cmd->seq);