The following commit has been merged in the linux branch: commit 9d38500de156fb28ffa8741acb90c4dc90a9fb4b Author: Christof Schmitt christof.schmitt@de.ibm.com Date: Tue Oct 13 10:44:10 2009 +0200

[SCSI] zfcp: Fix timer initialization for ct and els requests

Add HZ since the start_timer function expects jiffies, not seconds.

Reviewed-by: Swen Schillig swen@vnet.ibm.com Signed-off-by: Christof Schmitt christof.schmitt@de.ibm.com Signed-off-by: James Bottomley James.Bottomley@suse.de

diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c index 5126461..4e41baa 100644 --- a/drivers/s390/scsi/zfcp_fsf.c +++ b/drivers/s390/scsi/zfcp_fsf.c @@ -1079,7 +1079,7 @@ static int zfcp_fsf_setup_ct_els(struct zfcp_fsf_req *req, /* common settings for ct/gs and els requests */ req->qtcb->bottom.support.service_class = FSF_CLASS_3; req->qtcb->bottom.support.timeout = 2 * R_A_TOV; - zfcp_fsf_start_timer(req, 2 * R_A_TOV + 10); + zfcp_fsf_start_timer(req, (2 * R_A_TOV + 10) * HZ);

return 0; }