LU-4976 osp: add comments for lwp_dev.c functions

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

diff --git a/lustre/ptlrpc/nrs_crr.c b/lustre/ptlrpc/nrs_crr.c
index 2214176..1d3259d 100644 (file)
--- a/lustre/ptlrpc/nrs_crr.c
+++ b/lustre/ptlrpc/nrs_crr.c
@@ -112,47 +112,47 @@ static unsigned nrs_crrn_hop_hash(cfs_hash_t *hs, const void *key,
        return cfs_hash_djb2_hash(key, sizeof(lnet_nid_t), mask);
 }
 
-static int nrs_crrn_hop_keycmp(const void *key, cfs_hlist_node_t *hnode)
+static int nrs_crrn_hop_keycmp(const void *key, struct hlist_node *hnode)
 {
        lnet_nid_t              *nid = (lnet_nid_t *)key;
-       struct nrs_crrn_client  *cli = cfs_hlist_entry(hnode,
+       struct nrs_crrn_client  *cli = hlist_entry(hnode,
                                                       struct nrs_crrn_client,
                                                       cc_hnode);
        return *nid == cli->cc_nid;
 }
 
-static void *nrs_crrn_hop_key(cfs_hlist_node_t *hnode)
+static void *nrs_crrn_hop_key(struct hlist_node *hnode)
 {
-       struct nrs_crrn_client  *cli = cfs_hlist_entry(hnode,
+       struct nrs_crrn_client  *cli = hlist_entry(hnode,
                                                       struct nrs_crrn_client,
                                                       cc_hnode);
        return &cli->cc_nid;
 }
 
-static void *nrs_crrn_hop_object(cfs_hlist_node_t *hnode)
+static void *nrs_crrn_hop_object(struct hlist_node *hnode)
 {
-       return cfs_hlist_entry(hnode, struct nrs_crrn_client, cc_hnode);
+       return hlist_entry(hnode, struct nrs_crrn_client, cc_hnode);
 }
 
-static void nrs_crrn_hop_get(cfs_hash_t *hs, cfs_hlist_node_t *hnode)
+static void nrs_crrn_hop_get(cfs_hash_t *hs, struct hlist_node *hnode)
 {
-       struct nrs_crrn_client *cli = cfs_hlist_entry(hnode,
+       struct nrs_crrn_client *cli = hlist_entry(hnode,
                                                      struct nrs_crrn_client,
                                                      cc_hnode);
        atomic_inc(&cli->cc_ref);
 }
 
-static void nrs_crrn_hop_put(cfs_hash_t *hs, cfs_hlist_node_t *hnode)
+static void nrs_crrn_hop_put(cfs_hash_t *hs, struct hlist_node *hnode)
 {
-       struct nrs_crrn_client  *cli = cfs_hlist_entry(hnode,
+       struct nrs_crrn_client  *cli = hlist_entry(hnode,
                                                       struct nrs_crrn_client,
                                                       cc_hnode);
        atomic_dec(&cli->cc_ref);
 }
 
-static void nrs_crrn_hop_exit(cfs_hash_t *hs, cfs_hlist_node_t *hnode)
+static void nrs_crrn_hop_exit(cfs_hash_t *hs, struct hlist_node *hnode)
 {
-       struct nrs_crrn_client  *cli = cfs_hlist_entry(hnode,
+       struct nrs_crrn_client  *cli = hlist_entry(hnode,
                                                       struct nrs_crrn_client,
                                                       cc_hnode);
        LASSERTF(atomic_read(&cli->cc_ref) == 0,
@@ -214,7 +214,7 @@ static int nrs_crrn_start(struct ptlrpc_nrs_policy *policy, char *arg)
         * with the default max_rpcs_in_flight value, as we are scheduling over
         * NIDs, and there may be more than one mount point per client.
         */
-       net->cn_quantum = OSC_MAX_RIF_DEFAULT;
+       net->cn_quantum = OBD_MAX_RIF_DEFAULT;
        /**
         * Set to 1 so that the test inside nrs_crrn_req_add() can evaluate to
         * true.
@@ -267,8 +267,8 @@ static void nrs_crrn_stop(struct ptlrpc_nrs_policy *policy)
  * \param[in]    opc    the opcode
  * \param[in,out] arg   used for passing parameters and information
  *
- * \pre spin_is_locked(&policy->pol_nrs->->nrs_lock)
- * \post spin_is_locked(&policy->pol_nrs->->nrs_lock)
+ * \pre assert_spin_locked(&policy->pol_nrs->->nrs_lock)
+ * \post assert_spin_locked(&policy->pol_nrs->->nrs_lock)
  *
  * \retval 0   operation carried out successfully
  * \retval -ve error
@@ -276,7 +276,7 @@ static void nrs_crrn_stop(struct ptlrpc_nrs_policy *policy)
 int nrs_crrn_ctl(struct ptlrpc_nrs_policy *policy, enum ptlrpc_nrs_ctl opc,
                 void *arg)
 {
-       LASSERT(spin_is_locked(&policy->pol_nrs->nrs_lock));
+       assert_spin_locked(&policy->pol_nrs->nrs_lock);
 
        switch((enum nrs_ctl_crr)opc) {
        default: