X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_handles.h;h=05b83e64ebf1cb96e9e4becfdee2d5fa8e9432da;hb=c2c14f31da5f69770d3a46627c81335f5b8d7821;hp=eddb04af134b37b9c9607ca710f7ca0b0cf86fbd;hpb=1069f0832fe33a6944bcba0773ae4241949f970c;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_handles.h b/lustre/include/lustre_handles.h
index eddb04a..05b83e6 100644
--- a/lustre/include/lustre_handles.h
+++ b/lustre/include/lustre_handles.h
@@ -26,6 +26,8 @@
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -44,17 +46,15 @@
 #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>
 
-#if !defined(HAVE_RCU) || !defined(__KERNEL__)
+#ifndef __KERNEL__
 typedef struct {
-        int foo;
+	int foo;
 } cfs_rcu_head_t;
 #endif
 
@@ -75,13 +75,14 @@ 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;
-	cfs_spinlock_t			h_lock;
+	spinlock_t			h_lock;
 	unsigned int			h_size:31;
 	unsigned int			h_in:1;
 };
@@ -94,7 +95,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);