LU-12336 build: Update ZFS version to 0.8.1

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

diff --git a/lustre/include/lustre_handles.h b/lustre/include/lustre_handles.h
index c46bd79..bbbefad 100644 (file)
--- a/lustre/include/lustre_handles.h
+++ b/lustre/include/lustre_handles.h
@@ -15,11 +15,7 @@
  *
  * 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
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -65,8 +61,7 @@ struct portals_handle_ops {
 struct portals_handle {
        struct list_head                h_link;
        __u64                           h_cookie;
-       const void                     *h_owner;
-       struct portals_handle_ops      *h_ops;
+       const struct portals_handle_ops *h_ops;
 
        /* newly added fields to handle the RCU issue. -jxiong */
        struct rcu_head                 h_rcu;
@@ -79,10 +74,9 @@ struct portals_handle {
 
 /* Add a handle to the hash table */
 void class_handle_hash(struct portals_handle *,
-                      struct portals_handle_ops *ops);
+                      const 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, const void *owner);
+void *class_handle2object(u64 cookie, const struct portals_handle_ops *ops);
 void class_handle_free_cb(struct rcu_head *rcu);
 int class_handle_init(void);
 void class_handle_cleanup(void);