LU-13128 osc: glimpse and lock cancel race

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

diff --git a/lustre/include/lustre_nrs_crr.h b/lustre/include/lustre_nrs_crr.h
index de52699..06be0ae 100644 (file)
--- a/lustre/include/lustre_nrs_crr.h
+++ b/lustre/include/lustre_nrs_crr.h
@@ -38,14 +38,16 @@
  * CRR-N, Client Round Robin over NIDs
  * @{
  */
+#include <libcfs/linux/linux-hash.h>
 
 /**
  * private data structure for CRR-N NRS
  */
 struct nrs_crrn_net {
        struct ptlrpc_nrs_resource      cn_res;
-       cfs_binheap_t                  *cn_binheap;
-       cfs_hash_t                     *cn_cli_hash;
+       struct cfs_binheap             *cn_binheap;
+       /* CRR-N NRS - NID hash body */
+       struct rhashtable               cn_cli_hash;
        /**
         * Used when a new scheduling round commences, in order to synchronize
         * all clients with the new round number.
@@ -68,7 +70,7 @@ struct nrs_crrn_net {
  */
 struct nrs_crrn_client {
        struct ptlrpc_nrs_resource      cc_res;
-       struct hlist_node               cc_hnode;
+       struct rhash_head               cc_rhead;
        lnet_nid_t                      cc_nid;
        /**
         * The round number against which this client is currently scheduling