X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_handles.h;h=75854be7980ad3e3538f65fd883f6c2288635371;hb=f5ccdbcbf94decd5445d9ddd0ade7d5f4c2645e2;hp=5db904e2a08b84146f05d64d6afe3a40937dee4f;hpb=45c495867c903379ec9e9acf01d3d49caffa36e4;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_handles.h b/lustre/include/lustre_handles.h
index 5db904e..75854be 100644
--- a/lustre/include/lustre_handles.h
+++ b/lustre/include/lustre_handles.h
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +24,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -54,7 +52,16 @@
 
 #include <libcfs/libcfs.h>
 
-typedef void (*portals_handle_addref_cb)(void *object);
+#ifndef __KERNEL__
+typedef struct {
+	int foo;
+} cfs_rcu_head_t;
+#endif
+
+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:
@@ -65,29 +72,26 @@ 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;
+	cfs_list_t			h_link;
+	__u64				h_cookie;
+	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 */
+	cfs_rcu_head_t			h_rcu;
+	cfs_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);