From 033ae3eb4fff8fd5f653ce1a6dfdb6d516658f84 Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Thu, 30 Sep 2010 21:59:34 +0800 Subject: [PATCH] b=23289 cleanup legacy code from ldlm bug 23289 attachment 31641 o=zhen.liang i=oleg.drokin i=andreas.dilger --- lustre/include/lustre_dlm.h | 6 ------ lustre/ldlm/ldlm_lock.c | 3 --- lustre/ldlm/ldlm_resource.c | 14 ++------------ 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/lustre/include/lustre_dlm.h b/lustre/include/lustre_dlm.h index 161d55f..4b3521d 100644 --- a/lustre/include/lustre_dlm.h +++ b/lustre/include/lustre_dlm.h @@ -694,10 +694,6 @@ struct ldlm_lock { void *l_lvb_data; void *l_ast_data; - cfs_spinlock_t l_extents_list_lock; - cfs_list_t l_extents_list; - - cfs_list_t l_cache_locks_list; /* * Server-side-only members. @@ -757,8 +753,6 @@ struct ldlm_resource { /* protected by ns_hash_lock */ cfs_list_t lr_hash; - struct ldlm_resource *lr_parent; /* 0 for a root resource */ - cfs_list_t lr_children; /* list head for child resources */ cfs_list_t lr_childof; /* part of ns_root_list if root res, * part of lr_children if child */ cfs_spinlock_t lr_lock; diff --git a/lustre/ldlm/ldlm_lock.c b/lustre/ldlm/ldlm_lock.c index 88aacc8..e3b255e 100644 --- a/lustre/ldlm/ldlm_lock.c +++ b/lustre/ldlm/ldlm_lock.c @@ -371,9 +371,6 @@ static struct ldlm_lock *ldlm_lock_new(struct ldlm_resource *resource) CFS_INIT_LIST_HEAD(&lock->l_handle.h_link); class_handle_hash(&lock->l_handle, lock_handle_addref); - CFS_INIT_LIST_HEAD(&lock->l_extents_list); - cfs_spin_lock_init(&lock->l_extents_list_lock); - CFS_INIT_LIST_HEAD(&lock->l_cache_locks_list); lu_ref_init(&lock->l_reference); lu_ref_add(&lock->l_reference, "hash", lock); lock->l_callback_timeout = 0; diff --git a/lustre/ldlm/ldlm_resource.c b/lustre/ldlm/ldlm_resource.c index b718fbc..9860694 100644 --- a/lustre/ldlm/ldlm_resource.c +++ b/lustre/ldlm/ldlm_resource.c @@ -797,7 +797,6 @@ static struct ldlm_resource *ldlm_resource_new(void) memset(res, 0, sizeof(*res)); - CFS_INIT_LIST_HEAD(&res->lr_children); CFS_INIT_LIST_HEAD(&res->lr_childof); CFS_INIT_LIST_HEAD(&res->lr_granted); CFS_INIT_LIST_HEAD(&res->lr_converting); @@ -886,12 +885,8 @@ ldlm_resource_add(struct ldlm_namespace *ns, struct ldlm_resource *parent, ns->ns_resources++; ldlm_namespace_get_locked(ns); - if (parent == NULL) { - cfs_list_add(&res->lr_childof, &ns->ns_root_list); - } else { - res->lr_parent = parent; - cfs_list_add(&res->lr_childof, &parent->lr_children); - } + LASSERT(parent == NULL); /* legacy... */ + cfs_list_add(&res->lr_childof, &ns->ns_root_list); cfs_spin_unlock(&ns->ns_hash_lock); if (ns->ns_lvbo && ns->ns_lvbo->lvbo_init) { @@ -976,11 +971,6 @@ void __ldlm_resource_putref_final(struct ldlm_resource *res) LBUG(); } - if (!cfs_list_empty(&res->lr_children)) { - ldlm_resource_dump(D_ERROR, res); - LBUG(); - } - /* Pass 0 here to not wake ->ns_waitq up yet, we will do it few * lines below when all children are freed. */ ldlm_namespace_put_locked(ns, 0); -- 1.8.3.1