LU-17362 build: Update ZFS version to 2.1.15

[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 06be0ae..67166e7 100644 (file)
--- a/lustre/include/lustre_nrs_crr.h
+++ b/lustre/include/lustre_nrs_crr.h
@@ -45,7 +45,7 @@
  */
 struct nrs_crrn_net {
        struct ptlrpc_nrs_resource      cn_res;
-       struct cfs_binheap             *cn_binheap;
+       struct binheap         *cn_binheap;
        /* CRR-N NRS - NID hash body */
        struct rhashtable               cn_cli_hash;
        /**
@@ -71,7 +71,7 @@ struct nrs_crrn_net {
 struct nrs_crrn_client {
        struct ptlrpc_nrs_resource      cc_res;
        struct rhash_head               cc_rhead;
-       lnet_nid_t                      cc_nid;
+       struct lnet_nid                 cc_nid;
        /**
         * The round number against which this client is currently scheduling
         * requests.
@@ -112,17 +112,14 @@ struct nrs_crrn_req {
 
 /**
  * CRR-N policy operations.
+ *
+ * Read the RR quantum size of a CRR-N policy.
  */
-enum nrs_ctl_crr {
-       /**
-        * Read the RR quantum size of a CRR-N policy.
-        */
-       NRS_CTL_CRRN_RD_QUANTUM = PTLRPC_NRS_CTL_1ST_POL_SPEC,
-       /**
-        * Write the RR quantum size of a CRR-N policy.
-        */
-       NRS_CTL_CRRN_WR_QUANTUM,
-};
+#define NRS_CTL_CRRN_RD_QUANTUM PTLRPC_NRS_CTL_POL_SPEC_01
+/**
+ * Write the RR quantum size of a CRR-N policy.
+ */
+#define NRS_CTL_CRRN_WR_QUANTUM PTLRPC_NRS_CTL_POL_SPEC_02
 
 /** @} CRR-N */
 #endif