From a5081b7362e44b8d38aee1112f9a7d3aae1642c0 Mon Sep 17 00:00:00 2001 From: Patrick Farrell Date: Mon, 18 Sep 2017 06:05:48 -0500 Subject: [PATCH] LU-7802 ldlm: No -EINVAL for canceled != unused If any locks are removed from or added to the lru, the check of "number unused vs number cancelled" may be wrong. This is fine - do not return an error or print debug in this case. Signed-off-by: Patrick Farrell Change-Id: I2ee9b8d86fbd6c9bd2c29e3472e3d410ee303374 Reviewed-on: https://review.whamcloud.com/28560 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin --- lustre/ldlm/ldlm_resource.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/lustre/ldlm/ldlm_resource.c b/lustre/ldlm/ldlm_resource.c index 31ee704..41e7c1e 100644 --- a/lustre/ldlm/ldlm_resource.c +++ b/lustre/ldlm/ldlm_resource.c @@ -327,19 +327,10 @@ static ssize_t lru_size_store(struct kobject *kobj, struct attribute *attr, "dropping all unused locks from namespace %s\n", ldlm_ns_name(ns)); if (ns_connect_lru_resize(ns)) { - int canceled, unused = ns->ns_nr_unused; - /* Try to cancel all @ns_nr_unused locks. */ - canceled = ldlm_cancel_lru(ns, unused, 0, - LDLM_LRU_FLAG_PASSED | - LDLM_LRU_FLAG_CLEANUP); - if (canceled < unused) { - CDEBUG(D_DLMTRACE, - "not all requested locks are canceled, requested: %d, canceled: %d\n", - unused, - canceled); - return -EINVAL; - } + ldlm_cancel_lru(ns, ns->ns_nr_unused, 0, + LDLM_LRU_FLAG_PASSED | + LDLM_LRU_FLAG_CLEANUP); } else { tmp = ns->ns_max_unused; ns->ns_max_unused = 0; -- 1.8.3.1