From ba48ea81ee190ff60013dfdeb9e88840b6c34e66 Mon Sep 17 00:00:00 2001 From: Mike Christie Date: Tue, 12 Aug 2008 19:44:03 -0500 Subject: [PATCH 04/23] libfc: don't pass wait_for_completion_timeout msecs wait_for_completion_timeout wants jiffes not msecs. I think for some of these tmf timesout we also want other timers based on r_a_tov (from fcp4 or something), and not FC_SCSI_TM_TOV. Probably does not make much difference though. Signed-off-by: Mike Christie --- drivers/scsi/libfc/fc_fcp.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c index 1b56c8c..cd77273 100644 --- a/drivers/scsi/libfc/fc_fcp.c +++ b/drivers/scsi/libfc/fc_fcp.c @@ -1013,8 +1013,7 @@ static int fc_fcp_pkt_abort(struct fc_lport *lp, struct fc_fcp_pkt *fsp) fsp->wait_for_comp = 1; spin_unlock_bh(&fsp->scsi_pkt_lock); - rc = wait_for_completion_timeout(&fsp->tm_done, - msecs_to_jiffies(FC_SCSI_TM_TOV)); + rc = wait_for_completion_timeout(&fsp->tm_done, FC_SCSI_TM_TOV); spin_lock_bh(&fsp->scsi_pkt_lock); if (fsp->seq_ptr) { -- 1.5.5.1