From 58f8831597298e25483f022b411a3dd7e7beba8e Mon Sep 17 00:00:00 2001
From: yury <yury>
Date: Wed, 16 Apr 2008 20:49:35 +0000
Subject: [PATCH] b=15440 r=shadow,adilger - remove @ns from list using
list_del_init() to make sure that consequnet list_empty() will really work
right on removed listy_head.
---
lustre/ldlm/ldlm_resource.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/lustre/ldlm/ldlm_resource.c b/lustre/ldlm/ldlm_resource.c
index 203be7cd94..df5bc2cbd4 100644
--- a/lustre/ldlm/ldlm_resource.c
+++ b/lustre/ldlm/ldlm_resource.c
@@ -505,7 +505,12 @@ int ldlm_namespace_free_prior(struct ldlm_namespace *ns)
RETURN(ELDLM_OK);
mutex_down(ldlm_namespace_lock(ns->ns_client));
- list_del(&ns->ns_list_chain);
+ /*
+ * Some asserts and possibly other parts of code still using
+ * list_empty(&ns->ns_list_chain). This is why it is important
+ * to use list_del_init() here.
+ */
+ list_del_init(&ns->ns_list_chain);
atomic_dec(ldlm_namespace_nr(ns->ns_client));
ldlm_pool_fini(&ns->ns_pool);
mutex_up(ldlm_namespace_lock(ns->ns_client));
@@ -556,6 +561,11 @@ int ldlm_namespace_free_post(struct ldlm_namespace *ns, int force)
#endif
OBD_VFREE(ns->ns_hash, sizeof(*ns->ns_hash) * RES_HASH_SIZE);
OBD_FREE(ns->ns_name, strlen(ns->ns_name) + 1);
+ /*
+ * @ns should be not on list in this time, otherwise this will cause
+ * issues realted to using freed @ns in pools thread.
+ */
+ LASSERT(list_empty(&ns->ns_list_chain));
OBD_FREE_PTR(ns);
ldlm_put_ref(force);
RETURN(ELDLM_OK);
--
GitLab