[SCSI] ibmvscsi timeout fix

This patch fixes a long term borkenness in
ibmvscsi where we were using the wrong timeout
field from the scsi command (and using the
wrong units.)  Now broken by the fact that the
scsi_cmnd timeout field is gone entirely.
This only worked before because all the SCSI
targets assumed that 0 was default.

Signed-off-by: Dave Boutcher <[email protected]>
Signed-off-by: James Bottomley <[email protected]>

diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index 1ae800ae93d7c90ca6cd2793cf1600736e058452..e3e6752c4104ae6a7cd24ddbca2c07ec346a4407 100644 (file)
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -594,7 +594,7 @@ static int ibmvscsi_queuecommand(struct scsi_cmnd *cmnd,
        init_event_struct(evt_struct,
                          handle_cmd_rsp,
                          VIOSRP_SRP_FORMAT,
-                         cmnd->timeout);
+                         cmnd->timeout_per_command/HZ);
 
        evt_struct->cmnd = cmnd;
        evt_struct->cmnd_done = done;