b=17167 cfs_rcu_head cleanup in lustre source

i=andreas.dilger
i=maxim.patlasov

diff --git a/libcfs/include/libcfs/winnt/winnt-fs.h b/libcfs/include/libcfs/winnt/winnt-fs.h
index 50a4543..98be623 100644 (file)
--- a/libcfs/include/libcfs/winnt/winnt-fs.h
+++ b/libcfs/include/libcfs/winnt/winnt-fs.h
@@ -376,10 +376,6 @@ int radix_tree_insert(struct radix_tree_root *root, unsigned long index,
                       void *item);
 void *radix_tree_delete(struct radix_tree_root *root, unsigned long index);
 
-typedef struct cfs_rcu_head {
-    int     foo;
-} cfs_rcu_head_t;
-
 #else  /* !__KERNEL__ */
 
 #if !defined(_WINDOWS_)

diff --git a/lustre/include/liblustre.h b/lustre/include/liblustre.h
index ff63241..b77e256 100644 (file)
--- a/lustre/include/liblustre.h
+++ b/lustre/include/liblustre.h
@@ -137,8 +137,6 @@ extern int echo_client_init(void);
 
 #define EXPORT_SYMBOL(S)
 
-typedef struct cfs_rcu_head { } cfs_rcu_head_t;
-
 typedef __u64 kdev_t;
 
 #ifndef min

diff --git a/lustre/include/linux/lustre_handles.h b/lustre/include/linux/lustre_handles.h
index 2407946..29eec05 100644 (file)
--- a/lustre/include/linux/lustre_handles.h
+++ b/lustre/include/linux/lustre_handles.h
@@ -53,8 +53,6 @@
 # ifdef HAVE_RCU
 #  include <linux/rcupdate.h> /* for rcu_head{} */
 typedef struct rcu_head cfs_rcu_head_t;
-# else
-typedef struct cfs_rcu_head { } cfs_rcu_head_t;
 # endif
 
 #endif /* ifdef __KERNEL__ */

diff --git a/lustre/include/lustre_handles.h b/lustre/include/lustre_handles.h
index 13bbb3a..afc9ddb 100644 (file)
--- a/lustre/include/lustre_handles.h
+++ b/lustre/include/lustre_handles.h
@@ -54,6 +54,12 @@
 
 #include <libcfs/libcfs.h>
 
+#if !defined(HAVE_RCU) || !defined(__KERNEL__)
+typedef struct {
+        int foo;
+} cfs_rcu_head_t;
+#endif
+
 typedef void (*portals_handle_addref_cb)(void *object);
 
 /* These handles are most easily used by having them appear at the very top of