From: Niu Yawei <yawei....@intel.com> 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 <yawei....@intel.com> Reviewed-on: http://review.whamcloud.com/9249 Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-4597 Reviewed-by: Bobi Jam <bobi...@gmail.com> Reviewed-by: Jinshan Xiong <jinshan.xi...@intel.com> Reviewed-by: Ned Bass <ba...@llnl.gov> Reviewed-by: Fan Yong <fan.y...@intel.com> Signed-off-by: Oleg Drokin <oleg.dro...@intel.com> --- drivers/staging/lustre/lustre/osc/osc_lock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/staging/lustre/lustre/osc/osc_lock.c b/drivers/staging/lustre/lustre/osc/osc_lock.c index ef7b9c2..1c6cafa 100644 --- a/drivers/staging/lustre/lustre/osc/osc_lock.c +++ b/drivers/staging/lustre/lustre/osc/osc_lock.c @@ -1192,6 +1192,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.5.3 _______________________________________________ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
