LU-5275 obdclass: Remove lprocfs_vars argument from class_register_type function

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

diff --git a/lustre/include/lustre_handles.h b/lustre/include/lustre_handles.h
index 035ae06..a3c16f6 100644 (file)
--- a/lustre/include/lustre_handles.h
+++ b/lustre/include/lustre_handles.h
@@ -42,23 +42,10 @@
  * @{
  */
 
-#if defined(__linux__)
 #include <linux/lustre_handles.h>
-#elif defined(__APPLE__)
-#include <darwin/lustre_handles.h>
-#elif defined(__WINNT__)
-#include <winnt/lustre_handles.h>
-#else
-#error Unsupported operating system.
-#endif
 
 #include <libcfs/libcfs.h>
 
-#ifndef __KERNEL__
-typedef struct {
-       int foo;
-} cfs_rcu_head_t;
-#endif
 
 struct portals_handle_ops {
        void (*hop_addref)(void *object);
@@ -77,9 +64,10 @@ 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 {
-       cfs_list_t                      h_link;
+       struct list_head                h_link;
        __u64                           h_cookie;
-       struct portals_handle_ops       *h_ops;
+       const void                     *h_owner;
+       struct portals_handle_ops      *h_ops;
 
        /* newly added fields to handle the RCU issue. -jxiong */
        cfs_rcu_head_t                  h_rcu;
@@ -96,7 +84,7 @@ void class_handle_hash(struct portals_handle *,
                       struct portals_handle_ops *ops);
 void class_handle_unhash(struct portals_handle *);
 void class_handle_hash_back(struct portals_handle *);
-void *class_handle2object(__u64 cookie);
+void *class_handle2object(__u64 cookie, const void *owner);
 void class_handle_free_cb(cfs_rcu_head_t *);
 int class_handle_init(void);
 void class_handle_cleanup(void);