Revert "LU-8383 build: Spec file cleanup after LU-5614"

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

diff --git a/lustre/obdclass/lustre_handles.c b/lustre/obdclass/lustre_handles.c
index 4d13acc..f79404b 100644 (file)
--- a/lustre/obdclass/lustre_handles.c
+++ b/lustre/obdclass/lustre_handles.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Intel Corporation.
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -39,31 +39,19 @@
  */
 
 #define DEBUG_SUBSYSTEM S_CLASS
-#ifndef __KERNEL__
-# include <liblustre.h>
-#endif
 
 #include <obd_support.h>
 #include <lustre_handles.h>
 #include <lustre_lib.h>
 
-#ifndef __KERNEL__
-# define list_add_rcu            cfs_list_add
-# define list_del_rcu            cfs_list_del
-# define list_for_each_rcu       cfs_list_for_each
-# define list_for_each_safe_rcu  cfs_list_for_each_safe
-# define list_for_each_entry_rcu cfs_list_for_each_entry
-# define rcu_read_lock()         spin_lock(&bucket->lock)
-# define rcu_read_unlock()       spin_unlock(&bucket->lock)
-#endif /* !__KERNEL__ */
 
 static __u64 handle_base;
 #define HANDLE_INCR 7
 static spinlock_t handle_base_lock;
 
 static struct handle_bucket {
-       spinlock_t      lock;
-       cfs_list_t      head;
+       spinlock_t       lock;
+       struct list_head head;
 } *handle_hash;
 
 #define HANDLE_HASH_SIZE (1 << 16)
@@ -80,7 +68,7 @@ void class_handle_hash(struct portals_handle *h,
         ENTRY;
 
         LASSERT(h != NULL);
-        LASSERT(cfs_list_empty(&h->h_link));
+       LASSERT(list_empty(&h->h_link));
 
         /*
          * This is fast, but simplistic cookie generation algorithm, it will
@@ -89,7 +77,6 @@ void class_handle_hash(struct portals_handle *h,
        spin_lock(&handle_base_lock);
        handle_base += HANDLE_INCR;
 
-       h->h_cookie = handle_base;
        if (unlikely(handle_base == 0)) {
                /*
                 * Cookie of zero is "dangerous", because in many places it's
@@ -99,6 +86,7 @@ void class_handle_hash(struct portals_handle *h,
                CWARN("The universe has been exhausted: cookie wrap-around.\n");
                handle_base += HANDLE_INCR;
        }
+       h->h_cookie = handle_base;
        spin_unlock(&handle_base_lock);
 
        h->h_ops = ops;
@@ -118,7 +106,7 @@ EXPORT_SYMBOL(class_handle_hash);
 
 static void class_handle_unhash_nolock(struct portals_handle *h)
 {
-        if (cfs_list_empty(&h->h_link)) {
+       if (list_empty(&h->h_link)) {
                 CERROR("removing an already-removed handle ("LPX64")\n",
                        h->h_cookie);
                 return;
@@ -164,7 +152,7 @@ void class_handle_hash_back(struct portals_handle *h)
 }
 EXPORT_SYMBOL(class_handle_hash_back);
 
-void *class_handle2object(__u64 cookie)
+void *class_handle2object(__u64 cookie, const void *owner)
 {
         struct handle_bucket *bucket;
         struct portals_handle *h;
@@ -179,7 +167,7 @@ void *class_handle2object(__u64 cookie)
 
         rcu_read_lock();
         list_for_each_entry_rcu(h, &bucket->head, h_link) {
-                if (h->h_cookie != cookie)
+               if (h->h_cookie != cookie || h->h_owner != owner)
                         continue;
 
                spin_lock(&h->h_lock);
@@ -196,10 +184,13 @@ void *class_handle2object(__u64 cookie)
 }
 EXPORT_SYMBOL(class_handle2object);
 
-void class_handle_free_cb(cfs_rcu_head_t *rcu)
+void class_handle_free_cb(struct rcu_head *rcu)
 {
-       struct portals_handle *h = RCU2HANDLE(rcu);
-       void *ptr = (void *)(unsigned long)h->h_cookie;
+       struct portals_handle *h;
+       void *ptr;
+
+       h = container_of(rcu, struct portals_handle, h_rcu);
+       ptr = (void *)(unsigned long)h->h_cookie;
 
        if (h->h_ops->hop_free != NULL)
                h->h_ops->hop_free(ptr, h->h_size);
@@ -223,14 +214,14 @@ int class_handle_init(void)
        spin_lock_init(&handle_base_lock);
        for (bucket = handle_hash + HANDLE_HASH_SIZE - 1; bucket >= handle_hash;
             bucket--) {
-               CFS_INIT_LIST_HEAD(&bucket->head);
+               INIT_LIST_HEAD(&bucket->head);
                spin_lock_init(&bucket->lock);
        }
 
-        /** bug 21430: add randomness to the initial base */
-        cfs_get_random_bytes(seed, sizeof(seed));
-        cfs_gettimeofday(&tv);
-        cfs_srand(tv.tv_sec ^ seed[0], tv.tv_usec ^ seed[1]);
+       /** bug 21430: add randomness to the initial base */
+       cfs_get_random_bytes(seed, sizeof(seed));
+       do_gettimeofday(&tv);
+       cfs_srand(tv.tv_sec ^ seed[0], tv.tv_usec ^ seed[1]);
 
         cfs_get_random_bytes(&handle_base, sizeof(handle_base));
         LASSERT(handle_base != 0ULL);