LU-15098 tests: sanity-sec 27a exec commands on right node

[fs/lustre-release.git] / lustre / ptlrpc / nrs_crr.c

diff --git a/lustre/ptlrpc/nrs_crr.c b/lustre/ptlrpc/nrs_crr.c
index 680cefb..dc41970 100644 (file)
--- a/lustre/ptlrpc/nrs_crr.c
+++ b/lustre/ptlrpc/nrs_crr.c
@@ -38,7 +38,6 @@
  * \addtogoup nrs
  * @{
  */
-#ifdef HAVE_SERVER_SUPPORT
 
 #define DEBUG_SUBSYSTEM S_RPC
 #include <obd_support.h>
@@ -73,7 +72,7 @@
  * \retval 1 e1 <= e2
  */
 static int
-crrn_req_compare(struct cfs_binheap_node *e1, struct cfs_binheap_node *e2)
+crrn_req_compare(struct binheap_node *e1, struct binheap_node *e2)
 {
        struct ptlrpc_nrs_request *nrq1;
        struct ptlrpc_nrs_request *nrq2;
@@ -89,7 +88,7 @@ crrn_req_compare(struct cfs_binheap_node *e1, struct cfs_binheap_node *e2)
        return nrq1->nr_u.crr.cr_sequence < nrq2->nr_u.crr.cr_sequence;
 }
 
-static struct cfs_binheap_ops nrs_crrn_heap_ops = {
+static struct binheap_ops nrs_crrn_heap_ops = {
        .hop_enter      = NULL,
        .hop_exit       = NULL,
        .hop_compare    = crrn_req_compare,
@@ -154,7 +153,7 @@ static int nrs_crrn_start(struct ptlrpc_nrs_policy *policy, char *arg)
        if (net == NULL)
                RETURN(-ENOMEM);
 
-       net->cn_binheap = cfs_binheap_create(&nrs_crrn_heap_ops,
+       net->cn_binheap = binheap_create(&nrs_crrn_heap_ops,
                                             CBH_FLAG_ATOMIC_GROW, 4096, NULL,
                                             nrs_pol2cptab(policy),
                                             nrs_pol2cptid(policy));
@@ -183,7 +182,7 @@ static int nrs_crrn_start(struct ptlrpc_nrs_policy *policy, char *arg)
        RETURN(rc);
 
 out_binheap:
-       cfs_binheap_destroy(net->cn_binheap);
+       binheap_destroy(net->cn_binheap);
 out_net:
        OBD_FREE_PTR(net);
 
@@ -206,10 +205,10 @@ static void nrs_crrn_stop(struct ptlrpc_nrs_policy *policy)
 
        LASSERT(net != NULL);
        LASSERT(net->cn_binheap != NULL);
-       LASSERT(cfs_binheap_is_empty(net->cn_binheap));
+       LASSERT(binheap_is_empty(net->cn_binheap));
 
        rhashtable_free_and_destroy(&net->cn_cli_hash, nrs_crrn_exit, NULL);
-       cfs_binheap_destroy(net->cn_binheap);
+       binheap_destroy(net->cn_binheap);
 
        OBD_FREE_PTR(net);
 }
@@ -377,7 +376,7 @@ struct ptlrpc_nrs_request *nrs_crrn_req_get(struct ptlrpc_nrs_policy *policy,
                                            bool peek, bool force)
 {
        struct nrs_crrn_net       *net = policy->pol_private;
-       struct cfs_binheap_node   *node = cfs_binheap_root(net->cn_binheap);
+       struct binheap_node       *node = binheap_root(net->cn_binheap);
        struct ptlrpc_nrs_request *nrq;
 
        nrq = unlikely(node == NULL) ? NULL :
@@ -394,7 +393,7 @@ struct ptlrpc_nrs_request *nrs_crrn_req_get(struct ptlrpc_nrs_policy *policy,
 
                LASSERT(nrq->nr_u.crr.cr_round <= cli->cc_round);
 
-               cfs_binheap_remove(net->cn_binheap, &nrq->nr_node);
+               binheap_remove(net->cn_binheap, &nrq->nr_node);
                cli->cc_active--;
 
                CDEBUG(D_RPCTRACE,
@@ -403,7 +402,7 @@ struct ptlrpc_nrs_request *nrs_crrn_req_get(struct ptlrpc_nrs_policy *policy,
                       libcfs_id2str(req->rq_peer), nrq->nr_u.crr.cr_round);
 
                /** Peek at the next request to be served */
-               node = cfs_binheap_root(net->cn_binheap);
+               node = binheap_root(net->cn_binheap);
 
                /** No more requests */
                if (unlikely(node == NULL)) {
@@ -498,7 +497,7 @@ static int nrs_crrn_req_add(struct ptlrpc_nrs_policy *policy,
        nrq->nr_u.crr.cr_round = cli->cc_round;
        nrq->nr_u.crr.cr_sequence = cli->cc_sequence;
 
-       rc = cfs_binheap_insert(net->cn_binheap, &nrq->nr_node);
+       rc = binheap_insert(net->cn_binheap, &nrq->nr_node);
        if (rc == 0) {
                cli->cc_active++;
                if (--cli->cc_quantum == 0)
@@ -528,9 +527,9 @@ static void nrs_crrn_req_del(struct ptlrpc_nrs_policy *policy,
 
        LASSERT(nrq->nr_u.crr.cr_round <= cli->cc_round);
 
-       is_root = &nrq->nr_node == cfs_binheap_root(net->cn_binheap);
+       is_root = &nrq->nr_node == binheap_root(net->cn_binheap);
 
-       cfs_binheap_remove(net->cn_binheap, &nrq->nr_node);
+       binheap_remove(net->cn_binheap, &nrq->nr_node);
        cli->cc_active--;
 
        /**
@@ -539,7 +538,7 @@ static void nrs_crrn_req_del(struct ptlrpc_nrs_policy *policy,
         */
        if (unlikely(is_root)) {
                /** Peek at the next request to be served */
-               struct cfs_binheap_node *node = cfs_binheap_root(net->cn_binheap);
+               struct binheap_node *node = binheap_root(net->cn_binheap);
 
                /** No more requests */
                if (unlikely(node == NULL)) {
@@ -786,7 +785,7 @@ LDEBUGFS_SEQ_FOPS(ptlrpc_lprocfs_nrs_crrn_quantum);
  */
 static int nrs_crrn_lprocfs_init(struct ptlrpc_service *svc)
 {
-       struct lprocfs_vars nrs_crrn_lprocfs_vars[] = {
+       struct ldebugfs_vars nrs_crrn_lprocfs_vars[] = {
                { .name         = "nrs_crrn_quantum",
                  .fops         = &ptlrpc_lprocfs_nrs_crrn_quantum_fops,
                  .data = svc },
@@ -796,7 +795,9 @@ static int nrs_crrn_lprocfs_init(struct ptlrpc_service *svc)
        if (!svc->srv_debugfs_entry)
                return 0;
 
-       return ldebugfs_add_vars(svc->srv_debugfs_entry, nrs_crrn_lprocfs_vars, NULL);
+       ldebugfs_add_vars(svc->srv_debugfs_entry, nrs_crrn_lprocfs_vars, NULL);
+
+       return 0;
 }
 
 /**
@@ -827,5 +828,3 @@ struct ptlrpc_nrs_pol_conf nrs_conf_crrn = {
 /** @} CRR-N policy */
 
 /** @} nrs */
-
-#endif /* HAVE_SERVER_SUPPORT */