diff options
| author | Mark Brown <broonie@kernel.org> | 2014-09-17 11:18:13 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-17 11:18:13 -0700 |
| commit | 0111d0f13469831266d716e3b50d580a3e25cff9 (patch) | |
| tree | e2c082e97808f1303190fae3bb79cb8bf359bf2c /drivers/scsi/scsi_transport_srp.c | |
| parent | 29a6185d2f78e35b0b36d0ed94bc27d2b71e1ef3 (diff) | |
| parent | af92ba8fd23cb5811d96b833bbb7133efefeb5b9 (diff) | |
Merge tag 'v3.14.19' into linux-linaro-lsk-v3.14lsk-v3.14-14.09
This is the 3.14.19 stable release
Diffstat (limited to 'drivers/scsi/scsi_transport_srp.c')
| -rw-r--r-- | drivers/scsi/scsi_transport_srp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c index d47ffc8d3e43..e3e794ee7ddd 100644 --- a/drivers/scsi/scsi_transport_srp.c +++ b/drivers/scsi/scsi_transport_srp.c @@ -473,7 +473,8 @@ static void __srp_start_tl_fail_timers(struct srp_rport *rport) if (delay > 0) queue_delayed_work(system_long_wq, &rport->reconnect_work, 1UL * delay * HZ); - if (srp_rport_set_state(rport, SRP_RPORT_BLOCKED) == 0) { + if ((fast_io_fail_tmo >= 0 || dev_loss_tmo >= 0) && + srp_rport_set_state(rport, SRP_RPORT_BLOCKED) == 0) { pr_debug("%s new state: %d\n", dev_name(&shost->shost_gendev), rport->state); scsi_target_block(&shost->shost_gendev); |