Skip to contentSkip to conversation

ibmvscsi timeout fix

PATCH In review Dave C Boutcher 2 participants 2 messages Aug 22, 2005

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

drivers/scsi/ibmvscsi/ibmvscsi.c +1 -1
@@ -594,7 +594,7 @@
 	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;
Signature · 1 line
Dave Boutcher
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines

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.

That was fast. I report the error to you and get a patch next time I look at my mail. This does fix the build break I saw in a 2.6.13-rc6-mm1 defconfig on ppc64.

Adding Andrew Morton to the distribution list since somebody else is bound to notice that ppc64 -mm doesn't compile anymore.

Quoted 16 lines
drivers/scsi/ibmvscsi/ibmvscsi.c +1 -1
@@ -594,7 +594,7 @@
 	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;