From c986b13d6a2fd0ee9c17c09c7b17775cb88022af Mon Sep 17 00:00:00 2001 From: johann Date: Mon, 19 Jan 2009 12:28:40 +0000 Subject: [PATCH] Branch b1_8 b=18044 i=bobijam i=vitaly copy DISCARD_DATA flag if cp ast includes bl ast. --- lustre/ldlm/ldlm_lockd.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c index 40033a7..d255360 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 -- 1.8.3.1