LU-1330 obdclass: add obd_target.h

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

diff --git a/lustre/include/lustre_handles.h b/lustre/include/lustre_handles.h
index eddb04a..035ae06 100644 (file)
--- 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/
@@ -52,9 +54,9 @@
 
 #include <libcfs/libcfs.h>
 
-#if !defined(HAVE_RCU) || !defined(__KERNEL__)
+#ifndef __KERNEL__
 typedef struct {
-        int foo;
+       int foo;
 } cfs_rcu_head_t;
 #endif
 
@@ -81,7 +83,7 @@ struct portals_handle {
 
        /* 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;
 };