From eff33f212054b490a98ae504924d4a85a9d3df47 Mon Sep 17 00:00:00 2001 From: ericm Date: Mon, 19 Oct 2009 21:21:48 +0000 Subject: [PATCH] branch: HEAD fix ost buil read/write busy waiting. b=20444 r=rread r=wangdi --- lustre/ost/ost_handler.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lustre/ost/ost_handler.c b/lustre/ost/ost_handler.c index 7f8f046..46c5996 100644 --- a/lustre/ost/ost_handler.c +++ b/lustre/ost/ost_handler.c @@ -771,7 +771,7 @@ static int ost_brw_read(struct ptlrpc_request *req, struct obd_trans_info *oti) do { long timeoutl = req->rq_deadline - cfs_time_current_sec(); - cfs_duration_t timeout = (timeoutl <= 0 || rc) ? + cfs_duration_t timeout = timeoutl <= 0 ? CFS_TICK : cfs_time_seconds(timeoutl); lwi = LWI_TIMEOUT_INTERVAL(timeout, cfs_time_seconds(1), @@ -1018,7 +1018,7 @@ static int ost_brw_write(struct ptlrpc_request *req, struct obd_trans_info *oti) do { long timeoutl = req->rq_deadline - cfs_time_current_sec(); - cfs_duration_t timeout = (timeoutl <= 0 || rc) ? + cfs_duration_t timeout = timeoutl <= 0 ? CFS_TICK : cfs_time_seconds(timeoutl); lwi = LWI_TIMEOUT_INTERVAL(timeout, cfs_time_seconds(1), ost_bulk_timeout, desc); -- 1.8.3.1