From: johann <johann>
Date: Mon, 19 Jan 2009 12:17:34 +0000 (+0000)
Subject: Branch b1_6
X-Git-Tag: GIT_EPOCH_B1_6~2^5~245
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=38fef71f0bf2afcdb517b9336c4b2e41fa145579;p=fs%2Flustre-release.git

Branch b1_6
b=18044
i=vitaly
i=bobijam

copy DISCARD_DATA flag if cp ast includes bl ast.
---

diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c
index 7fd5fa2..4dd6a3d 100644
--- a/lustre/ldlm/ldlm_lockd.c
+++ b/lustre/ldlm/ldlm_lockd.c
@@ -858,6 +858,8 @@ int ldlm_server_completion_ast(struct ldlm_lock *lock, int flags, void *data)
         lock_res_and_lock(lock);
         if (lock->l_flags & LDLM_FL_AST_SENT) {
                 body->lock_flags |= LDLM_FL_AST_SENT;
+                /* copy ast flags like LDLM_FL_DISCARD_DATA */
+                body->lock_flags |= (lock->l_flags & LDLM_AST_FLAGS);
 
                 /* We might get here prior to ldlm_handle_enqueue setting
                  * LDLM_FL_CANCEL_ON_BLOCK flag. Then we will put this lock