New release 2.15.64

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

diff --git a/lustre/include/lustre_nrs_tbf.h b/lustre/include/lustre_nrs_tbf.h
index 442bafe..738794a 100644 (file)
--- a/lustre/include/lustre_nrs_tbf.h
+++ b/lustre/include/lustre_nrs_tbf.h
@@ -80,6 +80,7 @@ struct nrs_tbf_client {
        /** Resource object for policy instance. */
        struct ptlrpc_nrs_resource       tc_res;
        /** Node in the hash table. */
+       struct rhash_head                tc_rhash;
        struct hlist_node                tc_hnode;
        /** NID of the client. */
        struct lnet_nid                  tc_nid;
@@ -92,7 +93,7 @@ struct nrs_tbf_client {
        /** Hash key of the client. */
        char                             tc_key[NRS_TBF_KEY_LEN];
        /** Reference number of the client. */
-       atomic_t                         tc_ref;
+       refcount_t                       tc_ref;
        /** Lock to protect rule and linkage. */
        spinlock_t                       tc_rule_lock;
        /** Linkage to rule. */
@@ -131,6 +132,10 @@ struct nrs_tbf_client {
         * nrs_tbf_head::th_cli_hash.
         */
        struct list_head                 tc_lru;
+       /**
+        * RCU head for rhashtable handling
+        */
+       struct rcu_head                  tc_rcu_head;
 };
 
 #define MAX_TBF_NAME (16)
@@ -236,6 +241,10 @@ struct nrs_tbf_head {
         */
        struct ptlrpc_nrs_resource       th_res;
        /**
+        * Hash of clients.
+        */
+       struct rhashtable                th_cli_rhash ____cacheline_aligned_in_smp;
+       /**
         * List of rules.
         */
        struct list_head                 th_list;
@@ -266,7 +275,7 @@ struct nrs_tbf_head {
        /**
         * Heap of queues.
         */
-       struct binheap          *th_binheap;
+       struct binheap                  *th_binheap;
        /**
         * Hash of clients.
         */