LU-12542 handle: use hlist for hash lists.

[fs/lustre-release.git] / lustre / obdclass / lustre_handles.c

diff --git a/lustre/obdclass/lustre_handles.c b/lustre/obdclass/lustre_handles.c
index 8a6bd97..1f93ed5 100644 (file)
--- a/lustre/obdclass/lustre_handles.c
+++ b/lustre/obdclass/lustre_handles.c
@@ -49,7 +49,7 @@ static DEFINE_SPINLOCK(handle_base_lock);
 
 static struct handle_bucket {
        spinlock_t lock;
-       struct list_head head;
+       struct hlist_head       head;
 } *handle_hash;
 
 #define HANDLE_HASH_SIZE (1 << 16)
@@ -66,7 +66,7 @@ void class_handle_hash(struct portals_handle *h, const char *owner)
        ENTRY;
 
        LASSERT(h != NULL);
-       LASSERT(list_empty(&h->h_link));
+       LASSERT(hlist_unhashed(&h->h_link));
 
        /*
         * This is fast, but simplistic cookie generation algorithm, it will
@@ -92,8 +92,7 @@ void class_handle_hash(struct portals_handle *h, const char *owner)
 
        bucket = &handle_hash[h->h_cookie & HANDLE_HASH_MASK];
        spin_lock(&bucket->lock);
-       list_add_rcu(&h->h_link, &bucket->head);
-       h->h_in = 1;
+       hlist_add_head_rcu(&h->h_link, &bucket->head);
        spin_unlock(&bucket->lock);
 
        CDEBUG(D_INFO, "added object %p with handle %#llx to hash\n",
@@ -104,7 +103,7 @@ EXPORT_SYMBOL(class_handle_hash);
 
 static void class_handle_unhash_nolock(struct portals_handle *h)
 {
-       if (list_empty(&h->h_link)) {
+       if (hlist_unhashed(&h->h_link)) {
                CERROR("removing an already-removed handle (%#llx)\n",
                       h->h_cookie);
                return;
@@ -114,13 +113,12 @@ static void class_handle_unhash_nolock(struct portals_handle *h)
               h, h->h_cookie);
 
        spin_lock(&h->h_lock);
-       if (h->h_in == 0) {
+       if (hlist_unhashed(&h->h_link)) {
                spin_unlock(&h->h_lock);
                return;
        }
-       h->h_in = 0;
+       hlist_del_init_rcu(&h->h_link);
        spin_unlock(&h->h_lock);
-       list_del_rcu(&h->h_link);
 }
 
 void class_handle_unhash(struct portals_handle *h)
@@ -151,7 +149,7 @@ void *class_handle2object(u64 cookie, const char *owner)
        bucket = handle_hash + (cookie & HANDLE_HASH_MASK);
 
        rcu_read_lock();
-       list_for_each_entry_rcu(h, &bucket->head, h_link) {
+       hlist_for_each_entry_rcu(h, &bucket->head, h_link) {
                if (h->h_cookie != cookie || h->h_owner != owner)
                        continue;
 
@@ -181,7 +179,7 @@ int class_handle_init(void)
 
        for (bucket = handle_hash + HANDLE_HASH_SIZE - 1; bucket >= handle_hash;
             bucket--) {
-               INIT_LIST_HEAD(&bucket->head);
+               INIT_HLIST_HEAD(&bucket->head);
                spin_lock_init(&bucket->lock);
        }
 
@@ -200,7 +198,7 @@ static int cleanup_all_handles(void)
                struct portals_handle *h;
 
                spin_lock(&handle_hash[i].lock);
-               list_for_each_entry_rcu(h, &(handle_hash[i].head), h_link) {
+               hlist_for_each_entry_rcu(h, &handle_hash[i].head, h_link) {
                        CERROR("force clean handle %#llx addr %p owner %p\n",
                               h->h_cookie, h, h->h_owner);