X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_handles.h;h=feab79285513ec4178946495e212c1cce29848e9;hb=f36a5491d0bf4d861dc3332a600fca5a450afcb6;hp=85e9e6d0c781ba438762ff08c8817fd257ad589b;hpb=e3a7c58aebafce40323db54bf6056029e5af4a70;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_handles.h b/lustre/include/lustre_handles.h
index 85e9e6d..feab792 100644
--- a/lustre/include/lustre_handles.h
+++ b/lustre/include/lustre_handles.h
@@ -15,17 +15,15 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -40,25 +38,14 @@
  * @{
  */
 
-#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 <linux/rcupdate.h>
+#include <linux/spinlock.h>
 #include <libcfs/libcfs.h>
 
-#if !defined(HAVE_RCU) || !defined(__KERNEL__)
-typedef struct {
-        int foo;
-} cfs_rcu_head_t;
-#endif
-
-typedef void (*portals_handle_addref_cb)(void *object);
+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:
@@ -69,33 +56,29 @@ typedef void (*portals_handle_addref_cb)(void *object);
  * };
  *
  * Now you're able to assign the results of cookie2handle directly to an
- * ldlm_lock.  If it's not at the top, you'll want to hack up a macro that
- * uses some offsetof() magic. */
-
+ * 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;
-        __u64 h_cookie;
-        portals_handle_addref_cb h_addref;
+	struct list_head		h_link;
+	__u64				h_cookie;
+	const void		       *h_owner;
+	struct portals_handle_ops      *h_ops;
 
-        /* newly added fields to handle the RCU issue. -jxiong */
-        cfs_spinlock_t h_lock;
-        void *h_ptr;
-        void (*h_free_cb)(void *, size_t);
-        cfs_rcu_head_t h_rcu;
-        unsigned int h_size;
-        __u8 h_in:1;
-        __u8 h_unused[3];
+	/* newly added fields to handle the RCU issue. -jxiong */
+	struct rcu_head			h_rcu;
+	spinlock_t			h_lock;
+	unsigned int			h_size:31;
+	unsigned int			h_in:1;
 };
-#define RCU2HANDLE(rcu)    container_of(rcu, struct portals_handle, h_rcu)
 
 /* handles.c */
 
 /* Add a handle to the hash table */
-void class_handle_hash(struct portals_handle *, portals_handle_addref_cb);
+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_handle_free_cb(cfs_rcu_head_t *);
+void *class_handle2object(__u64 cookie, const void *owner);
+void class_handle_free_cb(struct rcu_head *rcu);
 int class_handle_init(void);
 void class_handle_cleanup(void);