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 14:16:24 -0400 |
commit | 0816c9251a7180383bb7811e1a1545f7b78e5374 (patch) | |
tree | 1dffcde9c45f276b264c83511b6168baab4307a4 /drivers/scsi/scsi_error.c | |
parent | 0761df9c4b2d966da3af2ac4ee7372afa681ce63 (diff) |
[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_error.c')
-rw-r--r-- | drivers/scsi/scsi_error.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index f43de1e56420..562474499942 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c | |||
@@ -45,8 +45,6 @@ | |||
45 | 45 | ||
46 | static void scsi_eh_done(struct scsi_cmnd *scmd); | 46 | static void scsi_eh_done(struct scsi_cmnd *scmd); |
47 | 47 | ||
48 | #define SENSE_TIMEOUT (10*HZ) | ||
49 | |||
50 | /* | 48 | /* |
51 | * These should *probably* be handled by the host itself. | 49 | * These should *probably* be handled by the host itself. |
52 | * Since it is allowed to sleep, it probably should. | 50 | * Since it is allowed to sleep, it probably should. |
@@ -881,7 +879,7 @@ retry: | |||
881 | */ | 879 | */ |
882 | static int scsi_request_sense(struct scsi_cmnd *scmd) | 880 | static int scsi_request_sense(struct scsi_cmnd *scmd) |
883 | { | 881 | { |
884 | return scsi_send_eh_cmnd(scmd, NULL, 0, SENSE_TIMEOUT, ~0); | 882 | return scsi_send_eh_cmnd(scmd, NULL, 0, scmd->device->eh_timeout, ~0); |
885 | } | 883 | } |
886 | 884 | ||
887 | /** | 885 | /** |
@@ -982,7 +980,8 @@ static int scsi_eh_tur(struct scsi_cmnd *scmd) | |||
982 | int retry_cnt = 1, rtn; | 980 | int retry_cnt = 1, rtn; |
983 | 981 | ||
984 | retry_tur: | 982 | retry_tur: |
985 | rtn = scsi_send_eh_cmnd(scmd, tur_command, 6, SENSE_TIMEOUT, 0); | 983 | rtn = scsi_send_eh_cmnd(scmd, tur_command, 6, |
984 | scmd->device->eh_timeout, 0); | ||
986 | 985 | ||
987 | SCSI_LOG_ERROR_RECOVERY(3, printk("%s: scmd %p rtn %x\n", | 986 | SCSI_LOG_ERROR_RECOVERY(3, printk("%s: scmd %p rtn %x\n", |
988 | __func__, scmd, rtn)); | 987 | __func__, scmd, rtn)); |