From 67125dce608f2a73ae93a5ecbdd8c72e34643bf3 Mon Sep 17 00:00:00 2001 From: Vitaly Fertman Date: Thu, 11 Feb 2010 12:39:33 -0800 Subject: [PATCH] b=21882 handle SLV==1 on client side Initialize ldlm pool SLV to 0 on client side to handle SLV==1 obtained from server correctly i=reen i=adilger --- lustre/ldlm/ldlm_pool.c | 2 +- lustre/ldlm/ldlm_request.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lustre/ldlm/ldlm_pool.c b/lustre/ldlm/ldlm_pool.c index 4b92fcb..0ed45c6 100644 --- a/lustre/ldlm/ldlm_pool.c +++ b/lustre/ldlm/ldlm_pool.c @@ -870,7 +870,7 @@ int ldlm_pool_init(struct ldlm_pool *pl, struct ldlm_namespace *ns, pl->pl_server_lock_volume = ldlm_pool_slv_max(LDLM_POOL_HOST_L); } else { ldlm_pool_set_limit(pl, 1); - pl->pl_server_lock_volume = 1; + pl->pl_server_lock_volume = 0; pl->pl_ops = &ldlm_cli_pool_ops; pl->pl_recalc_period = LDLM_POOL_CLI_DEF_RECALC_PERIOD; } diff --git a/lustre/ldlm/ldlm_request.c b/lustre/ldlm/ldlm_request.c index 7b55b01..4c7c2f0 100644 --- a/lustre/ldlm/ldlm_request.c +++ b/lustre/ldlm/ldlm_request.c @@ -1345,7 +1345,7 @@ static ldlm_policy_res_t ldlm_cancel_lrur_policy(struct ldlm_namespace *ns, * Inform pool about current CLV to see it via proc. */ ldlm_pool_set_clv(pl, lv); - return (slv == 1 || lv < slv) ? + return (slv == 0 || lv < slv) ? LDLM_POLICY_KEEP_LOCK : LDLM_POLICY_CANCEL_LOCK; } -- 1.8.3.1