LU-12542 handle: discard h_lock.

[fs/lustre-release.git] / lustre / include / lustre_handles.h

diff --git a/lustre/include/lustre_handles.h b/lustre/include/lustre_handles.h
index feab792..e94e1f6 100644 (file)
--- a/lustre/include/lustre_handles.h
+++ b/lustre/include/lustre_handles.h
@@ -39,14 +39,14 @@
  */
 
 #include <linux/rcupdate.h>
+#ifdef HAVE_REFCOUNT_T
+#include <linux/refcount.h>
+#else
+#include <libcfs/linux/linux-refcount.h>
+#endif
 #include <linux/spinlock.h>
 #include <libcfs/libcfs.h>
 
-struct portals_handle_ops {
-       void (*hop_addref)(void *object);
-       void (*hop_free)(void *object, int size);
-};
-
 /* These handles are most easily used by having them appear at the very top of
  * whatever object that you want to make handles for.  ie:
  *
@@ -59,26 +59,19 @@ struct portals_handle_ops {
  * ldlm_lock.  If it's not at the top, you'll want to use container_of()
  * to compute the start of the structure based on the handle field. */
 struct portals_handle {
-       struct list_head                h_link;
+       struct hlist_node               h_link;
        __u64                           h_cookie;
-       const void                     *h_owner;
-       struct portals_handle_ops      *h_ops;
-
-       /* newly added fields to handle the RCU issue. -jxiong */
+       const char                      *h_owner;
+       refcount_t                      h_ref;
        struct rcu_head                 h_rcu;
-       spinlock_t                      h_lock;
-       unsigned int                    h_size:31;
-       unsigned int                    h_in:1;
 };
 
 /* handles.c */
 
 /* Add a handle to the hash table */
-void class_handle_hash(struct portals_handle *,
-                      struct portals_handle_ops *ops);
+void class_handle_hash(struct portals_handle *, const char *h_owner);
 void class_handle_unhash(struct portals_handle *);
-void *class_handle2object(__u64 cookie, const void *owner);
-void class_handle_free_cb(struct rcu_head *rcu);
+void *class_handle2object(u64 cookie, const char *h_owner);
 int class_handle_init(void);
 void class_handle_cleanup(void);