diff options
Diffstat (limited to 'drivers/staging/lustre/lustre/include/lustre_handles.h')
| -rw-r--r-- | drivers/staging/lustre/lustre/include/lustre_handles.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/staging/lustre/lustre/include/lustre_handles.h b/drivers/staging/lustre/lustre/include/lustre_handles.h index 94989c5e361f..726bbd3eaf55 100644 --- a/drivers/staging/lustre/lustre/include/lustre_handles.h +++ b/drivers/staging/lustre/lustre/include/lustre_handles.h @@ -42,7 +42,11 @@ * @{ */ -#include "linux/lustre_handles.h" +#include <linux/atomic.h> +#include <linux/list.h> +#include <linux/rcupdate.h> +#include <linux/spinlock.h> +#include <linux/types.h> #include "../../include/linux/libcfs/libcfs.h" @@ -69,7 +73,7 @@ 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; @@ -84,7 +88,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); -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); |