1 files changed, 5 insertions, 1 deletions

diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
index 21018a4df452..fb8d01370663 100644
--- a/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h
@@ -357,6 +357,7 @@ struct fc_rport {	/* aka fc_starget_attrs */
 /* bit field values for struct fc_rport "flags" field: */
 #define FC_RPORT_DEVLOSS_PENDING        0x01
 #define FC_RPORT_SCAN_PENDING           0x02
+#define FC_RPORT_FAST_FAIL_TIMEDOUT     0x03
 
 #define dev_to_rport(d)                         \
         container_of(d, struct fc_rport, dev)
@@ -683,7 +684,10 @@ fc_remote_port_chkready(struct fc_rport *rport)
                         result = DID_NO_CONNECT << 16;
                 break;
         case FC_PORTSTATE_BLOCKED:
-                result = DID_IMM_RETRY << 16;
+                if (rport->flags & FC_RPORT_FAST_FAIL_TIMEDOUT)
+                        result = DID_NO_CONNECT << 16;
+                else
+                        result = DID_IMM_RETRY << 16;
                 break;
         default:
                 result = DID_NO_CONNECT << 16;