diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2013-05-10 10:36:04 -0400 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-06-04 11:16:24 -0700 |
| commit | 0816c9251a7180383bb7811e1a1545f7b78e5374 (patch) | |
| tree | 1dffcde9c45f276b264c83511b6168baab4307a4 /drivers/scsi/scsi_scan.c | |
| parent | 0761df9c4b2d966da3af2ac4ee7372afa681ce63 (diff) | |
| download | linux-0816c9251a7180383bb7811e1a1545f7b78e5374.tar.bz2 | |
[SCSI] Allow error handling timeout to be specified
Introduce eh_timeout which can be used for error handling purposes. This
was previously hardcoded to 10 seconds in the SCSI error handling
code. However, for some fast-fail scenarios it is necessary to be able
to tune this as it can take several iterations (bus device, target, bus,
controller) before we give up.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/scsi_scan.c')
| -rw-r--r-- | drivers/scsi/scsi_scan.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 3e58b2245f1f..852915a08465 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c @@ -924,6 +924,8 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result, if (*bflags & BLIST_NO_DIF) sdev->no_dif = 1; + sdev->eh_timeout = SCSI_DEFAULT_EH_TIMEOUT; + transport_configure_device(&sdev->sdev_gendev); if (sdev->host->hostt->slave_configure) { |