X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_nrs_crr.h;h=c4c217bd526790cd5ea88ddee30d5ad62596c4e1;hb=0c1ae1cb9c19f8a4f6c5a7ff6a1fd54807430795;hp=277e902c8030b81e930037d6dffb288018f0b2d5;hpb=d8278c699434fd7975609e121a1a75820595a601;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_nrs_crr.h b/lustre/include/lustre_nrs_crr.h
index 277e902..c4c217b 100644
--- 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;
-	struct cfs_hash		       *cn_cli_hash;
+	struct 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