LU-8066 obdclass: Remove lprocfs_obd_short_io_bytes_* declarations

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

diff --git a/lustre/obdclass/lustre_handles.c b/lustre/obdclass/lustre_handles.c
index 7931442..9ac9cf1 100644 (file)
--- a/lustre/obdclass/lustre_handles.c
+++ b/lustre/obdclass/lustre_handles.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  *
  * lustre/obdclass/lustre_handles.c
  *
@@ -49,7 +48,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 +65,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
@@ -88,12 +87,10 @@ void class_handle_hash(struct portals_handle *h, const char *owner)
        spin_unlock(&handle_base_lock);
 
        h->h_owner = owner;
-       spin_lock_init(&h->h_lock);
 
        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 +101,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;
@@ -113,14 +110,7 @@ static void class_handle_unhash_nolock(struct portals_handle *h)
        CDEBUG(D_INFO, "removing object %p with handle %#llx from hash\n",
               h, h->h_cookie);
 
-       spin_lock(&h->h_lock);
-       if (h->h_in == 0) {
-               spin_unlock(&h->h_lock);
-               return;
-       }
-       h->h_in = 0;
-       spin_unlock(&h->h_lock);
-       list_del_rcu(&h->h_link);
+       hlist_del_init_rcu(&h->h_link);
 }
 
 void class_handle_unhash(struct portals_handle *h)
@@ -151,19 +141,16 @@ 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;
 
-               spin_lock(&h->h_lock);
-               if (likely(h->h_in != 0)) {
-                       refcount_inc(&h->h_ref);
+               if (refcount_inc_not_zero(&h->h_ref)) {
                        CDEBUG(D_INFO, "GET %s %p refcount=%d\n",
                               h->h_owner, h,
                               refcount_read(&h->h_ref));
                        retval = h;
                }
-               spin_unlock(&h->h_lock);
                break;
        }
        rcu_read_unlock();
@@ -178,13 +165,13 @@ int class_handle_init(void)
 
        LASSERT(handle_hash == NULL);
 
-       OBD_ALLOC_LARGE(handle_hash, sizeof(*bucket) * HANDLE_HASH_SIZE);
+       OBD_ALLOC_PTR_ARRAY_LARGE(handle_hash, HANDLE_HASH_SIZE);
        if (handle_hash == NULL)
                return -ENOMEM;
 
        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);
        }
 
@@ -203,7 +190,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);
 
@@ -224,7 +211,7 @@ void class_handle_cleanup(void)
 
        count = cleanup_all_handles();
 
-       OBD_FREE_LARGE(handle_hash, sizeof(*handle_hash) * HANDLE_HASH_SIZE);
+       OBD_FREE_PTR_ARRAY_LARGE(handle_hash, HANDLE_HASH_SIZE);
        handle_hash = NULL;
 
        if (count != 0)