LU-5560 obd: reserve connection flag OBD_CONNECT2_FILE_SECCTX

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

diff --git a/lustre/include/lustre_handles.h b/lustre/include/lustre_handles.h
index ac70270..7eea186 100644 (file)
--- a/lustre/include/lustre_handles.h
+++ b/lustre/include/lustre_handles.h
@@ -27,7 +27,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/
@@ -42,24 +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 <linux/rcupdate.h>
+#include <linux/spinlock.h>
 #include <libcfs/libcfs.h>
 
-#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);
@@ -83,12 +69,11 @@ struct portals_handle {
        struct portals_handle_ops      *h_ops;
 
        /* newly added fields to handle the RCU issue. -jxiong */
-       cfs_rcu_head_t                  h_rcu;
+       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 */
 
@@ -98,7 +83,7 @@ void class_handle_hash(struct portals_handle *,
 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_handle_free_cb(cfs_rcu_head_t *);
+void class_handle_free_cb(struct rcu_head *rcu);
 int class_handle_init(void);
 void class_handle_cleanup(void);