From e4e1baa84540f2b3ce466c732d2922538903918c Mon Sep 17 00:00:00 2001
From: zhanghc <zhanghc>
Date: Sun, 30 Nov 2008 16:12:44 +0000
Subject: [PATCH] branch=b1_6

b=17031

during refreshing locks waiting its I/O to complete,
take current service time into account, not only using
the timeout gotten by ldlm_get_enqueue_timeout

i=Andreas
i=Nathan.Rutman
---
 lustre/include/lustre_dlm.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lustre/include/lustre_dlm.h b/lustre/include/lustre_dlm.h
index 0507967..74a5324 100644
--- a/lustre/include/lustre_dlm.h
+++ b/lustre/include/lustre_dlm.h
@@ -696,7 +696,7 @@ int ldlm_handle_cancel(struct ptlrpc_request *req);
 int ldlm_request_cancel(struct ptlrpc_request *req,
                         struct ldlm_request *dlm_req, int first);
 int ldlm_del_waiting_lock(struct ldlm_lock *lock);
-int ldlm_refresh_waiting_lock(struct ldlm_lock *lock);
+int ldlm_refresh_waiting_lock(struct ldlm_lock *lock, int timeout);
 int ldlm_get_ref(void);
 void ldlm_put_ref(void);
 int ldlm_init_export(struct obd_export *exp);
-- 
1.8.3.1