From c8858e9f0ff0a8d36604f8590d33077ca1069e77 Mon Sep 17 00:00:00 2001 From: Niu Yawei Date: Thu, 13 Feb 2014 02:07:14 -0500 Subject: [PATCH] LU-4597 clio: clear nowait flag agl lock re-enqueue The LDLM_FL_BLOCK_NOWAIT flag should be cleared when re-enqueue the agl lock as normal glimpse, otherwise, it won't get size back if there is conflicting locks on other client. Lustre-change: http://review.whamcloud.com/9249 Lustre-commit: 85c352274b3435a41649e9a5089da83b54893d37 Change-Id: I421d033496b57fb3d24635587112eaab3ba2ea32 Signed-off-by: Niu Yawei Reviewed-on: http://review.whamcloud.com/9328 Reviewed-by: Jinshan Xiong Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/osc/osc_lock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lustre/osc/osc_lock.c b/lustre/osc/osc_lock.c index a03a1d9..274d4a7 100644 --- a/lustre/osc/osc_lock.c +++ b/lustre/osc/osc_lock.c @@ -1212,6 +1212,7 @@ static int osc_lock_wait(const struct lu_env *env, LASSERT(olck->ols_agl); olck->ols_agl = 0; + olck->ols_flags &= ~LDLM_FL_BLOCK_NOWAIT; rc = osc_lock_enqueue(env, slice, NULL, CEF_ASYNC | CEF_MUST); if (rc != 0) return rc; -- 1.8.3.1