From 5a13d01b7e7c5492ebb80b279a24ddef42f24d58 Mon Sep 17 00:00:00 2001
From: vitaly <vitaly>
Date: Thu, 27 Dec 2007 20:24:24 +0000
Subject: [PATCH] Branch b1_6 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 024a1e2..356582b 100644
--- a/lustre/ldlm/ldlm_lockd.c
+++ b/lustre/ldlm/ldlm_lockd.c
@@ -1292,7 +1292,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");
         }
 
-- 
1.8.3.1