Commit:     e555db930f7512491485cfc43df4306192835373
Parent:     2a4aa2c4b206c77b7cf522300ae9b616b0a883a4
Author:     Brian King <[EMAIL PROTECTED]>
AuthorDate: Thu Apr 19 13:59:59 2007 -0500
Committer:  James Bottomley <[EMAIL PROTECTED]>
CommitDate: Sun May 6 09:33:12 2007 -0500

    [SCSI] use sysfs configured timeout for EH Start Unit timeout
    Use the sysfs configurable timeout when issuing a START_UNIT
    command from the scsi error handler. This is needed for devices which
    take longer than thirty seconds to respond to the start
    unit. The problem was observed when sending a start unit
    to a disk array device in an ipr RAID adapter, which results
    in the adapter firmware sending potentially multiple commands
    to physical devices as a result of this command, which ended
    up timing out sometimes. This patch does not change the default
    value used for this command.
    Signed-off-by: Brian King <[EMAIL PROTECTED]>
    Signed-off-by: James Bottomley <[EMAIL PROTECTED]>
 drivers/scsi/scsi_error.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 3963e70..e8350c5 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -38,7 +38,6 @@
 #include "scsi_logging.h"
 #define SENSE_TIMEOUT          (10*HZ)
-#define START_UNIT_TIMEOUT     (30*HZ)
  * These should *probably* be handled by the host itself.
@@ -936,7 +935,7 @@ static int scsi_eh_try_stu(struct scsi_cmnd *scmd)
                for (i = 0; rtn == NEEDS_RETRY && i < 2; i++)
                        rtn = scsi_send_eh_cmnd(scmd, stu_command, 6,
-                                               START_UNIT_TIMEOUT, 0);
+                                               scmd->device->timeout, 0);
                if (rtn == SUCCESS)
                        return 0;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to