2 files changed, 8 insertions, 0 deletions

diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 8a7eb9f98a0c..7ccf3284dda3 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -734,6 +734,7 @@ static int srp_reconnect_target(struct srp_target_port *target)
 
         scsi_target_unblock(&shost->shost_gendev, ret == 0 ? SDEV_RUNNING :
                             SDEV_TRANSPORT_OFFLINE);
+        target->transport_offline = !!ret;
 
         if (ret)
                 goto err;
@@ -1353,6 +1354,12 @@ static int srp_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *scmnd)
         unsigned long flags;
         int len;
 
+        if (unlikely(target->transport_offline)) {
+                scmnd->result = DID_NO_CONNECT << 16;
+                scmnd->scsi_done(scmnd);
+                return 0;
+        }
+
         spin_lock_irqsave(&target->lock, flags);
         iu = __srp_get_tx_iu(target, SRP_IU_CMD);
         if (!iu)
diff --git a/drivers/infiniband/ulp/srp/ib_srp.h b/drivers/infiniband/ulp/srp/ib_srp.h
index de2d0b3c0bfe..66fbedda4571 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.h
+++ b/drivers/infiniband/ulp/srp/ib_srp.h
@@ -140,6 +140,7 @@ struct srp_target_port {
         unsigned int            cmd_sg_cnt;
         unsigned int            indirect_size;
         bool                    allow_ext_sg;
+        bool                    transport_offline;
 
         /* Everything above this point is used in the hot path of
          * command processing. Try to keep them packed into cachelines.