From 80d938812432ecc976cec816a64fc56e2e21e986 Mon Sep 17 00:00:00 2001
From: vitaly <vitaly>
Date: Fri, 28 Dec 2007 12:37:14 +0000
Subject: [PATCH] Branch HEAD b=13917 i=green i=shadow
if blocking ast come with completion ast, mark lock as LDLM_FL_BL_AST
---
lustre/ldlm/ldlm_lockd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c
index 1f63e1bf8b..9aac8b00c6 100644
--- a/lustre/ldlm/ldlm_lockd.c
+++ b/lustre/ldlm/ldlm_lockd.c
@@ -1330,7 +1330,7 @@ static void ldlm_handle_cp_callback(struct ptlrpc_request *req,
}
if (dlm_req->lock_flags & LDLM_FL_AST_SENT) {
- lock->l_flags |= LDLM_FL_CBPENDING;
+ lock->l_flags |= LDLM_FL_CBPENDING | LDLM_FL_BL_AST;
LDLM_DEBUG(lock, "completion AST includes blocking AST");
}
--
GitLab