LU-16518 ptlrpc: fix clang build errors

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

diff --git a/lustre/include/lustre_nrs.h b/lustre/include/lustre_nrs.h
index 8223c08..fd80e40 100644 (file)
--- a/lustre/include/lustre_nrs.h
+++ b/lustre/include/lustre_nrs.h
@@ -63,7 +63,16 @@ enum ptlrpc_nrs_ctl {
         * Policies can start using opcodes from this value and onwards for
         * their own purposes; the assigned value itself is arbitrary.
         */
-       PTLRPC_NRS_CTL_1ST_POL_SPEC = 0x20,
+       PTLRPC_NRS_CTL_POL_SPEC_01 = 0x20,
+       PTLRPC_NRS_CTL_POL_SPEC_02,
+       PTLRPC_NRS_CTL_POL_SPEC_03,
+       PTLRPC_NRS_CTL_POL_SPEC_04,
+       PTLRPC_NRS_CTL_POL_SPEC_05,
+       PTLRPC_NRS_CTL_POL_SPEC_06,
+       PTLRPC_NRS_CTL_POL_SPEC_07,
+       PTLRPC_NRS_CTL_POL_SPEC_08,
+       PTLRPC_NRS_CTL_POL_SPEC_09,
+       PTLRPC_NRS_CTL_POL_SPEC_10
 };
 
 /**
@@ -672,6 +681,16 @@ enum {
 };
 
 #include <lustre_nrs_fifo.h>
+/**
+ * Binary heap node.
+ *
+ * Objects of this type are embedded into objects of the ordered set that is to
+ * be maintained by a \e struct binheap instance.
+ */
+struct binheap_node {
+       /** Index into the binary tree */
+       unsigned int    chn_index;
+};
 #ifdef HAVE_SERVER_SUPPORT
 #include <lustre_nrs_tbf.h>
 #include <lustre_nrs_crr.h>
@@ -703,7 +722,7 @@ struct ptlrpc_nrs_request {
        unsigned                        nr_enqueued:1;
        unsigned                        nr_started:1;
        unsigned                        nr_finalized:1;
-       struct cfs_binheap_node         nr_node;
+       struct binheap_node             nr_node;
 
        /**
         * Policy-specific fields, used for determining a request's scheduling