X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fquota%2Fqmt_handler.c;h=2a1bae8f9d274b52630b251dc477d1e65849d6a4;hb=755c04eba3f52245ecddd5c0d7a205988181d7d1;hp=948e398e92fac3d73f4406461583903afc86265e;hpb=5171780a7b5301cdbb6f98d8c887899600ef098a;p=fs%2Flustre-release.git

diff --git a/lustre/quota/qmt_handler.c b/lustre/quota/qmt_handler.c
index 948e398..2a1bae8 100644
--- a/lustre/quota/qmt_handler.c
+++ b/lustre/quota/qmt_handler.c
@@ -21,17 +21,13 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012 Intel, Inc.
+ * Copyright (c) 2012, Intel Corporation.
  * Use is subject to license terms.
  *
  * Author: Johann Lombardi <johann.lombardi@intel.com>
  * Author: Niu    Yawei    <yawei.niu@intel.com>
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
-
 #define DEBUG_SUBSYSTEM S_LQUOTA
 
 #include <obd_class.h>
@@ -647,13 +643,13 @@ static int qmt_dqacq(const struct lu_env *env, struct lu_device *ld,
 			RETURN(-ENOLCK);
 		}
 
-		if ((lock->l_flags & LDLM_FL_AST_SENT) != 0) {
+		if (ldlm_is_ast_sent(lock)) {
 			struct ptlrpc_service_part	*svc;
 			unsigned int			 timeout;
 
 			svc = req->rq_rqbd->rqbd_svcpt;
 			timeout = at_est2timeout(at_get(&svc->scp_at_estimate));
-			timeout = max(timeout, ldlm_timeout);
+			timeout += (ldlm_bl_timeout(lock) >> 1);
 
 			/* lock is being cancelled, prolong timeout */
 			ldlm_refresh_waiting_lock(lock, timeout);