From 85c352274b3435a41649e9a5089da83b54893d37 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. Signed-off-by: Niu Yawei Change-Id: Ifd311606e824d6574bfbf3256841061e8867214a --- 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 e06a900..842686d 100644 --- a/lustre/osc/osc_lock.c +++ b/lustre/osc/osc_lock.c @@ -1284,6 +1284,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