LU-15099 kernel: kernel update RHEL7.9 [3.10.0-1160.45.1.el7]

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

diff --git a/lustre/include/lustre_handles.h b/lustre/include/lustre_handles.h
index 41670d5..538f427 100644 (file)
--- a/lustre/include/lustre_handles.h
+++ b/lustre/include/lustre_handles.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
 #ifndef __LUSTRE_HANDLES_H_
@@ -39,11 +38,7 @@
  */
 
 #include <linux/rcupdate.h>
-#ifdef HAVE_REFCOUNT_T
 #include <linux/refcount.h>
-#else
-#include <libcfs/linux/linux-refcount.h>
-#endif
 #include <linux/spinlock.h>
 #include <libcfs/libcfs.h>
 
@@ -59,15 +54,11 @@
  * ldlm_lock.  If it's not at the top, you'll want to use container_of()
  * to compute the start of the structure based on the handle field. */
 struct portals_handle {
-       struct list_head                h_link;
+       struct hlist_node               h_link;
        __u64                           h_cookie;
        const char                      *h_owner;
        refcount_t                      h_ref;
-
-       /* newly added fields to handle the RCU issue. -jxiong */
        struct rcu_head                 h_rcu;
-       spinlock_t                      h_lock;
-       unsigned int                    h_in:1;
 };
 
 /* handles.c */