X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fnrs_crr.c;h=ea5e127c71b6277bc69d8ebcbbb2f4c87475e469;hb=f28cc25929c4e8a111e96b2205a0433542b35e84;hp=96be3b74e905cffa051f885b689246d4662e9881;hpb=6fc8da41f2ff5156639e89f379adcdbb73ac8567;p=fs%2Flustre-release.git

diff --git a/lustre/ptlrpc/nrs_crr.c b/lustre/ptlrpc/nrs_crr.c
index 96be3b7..ea5e127 100644
--- a/lustre/ptlrpc/nrs_crr.c
+++ b/lustre/ptlrpc/nrs_crr.c
@@ -72,7 +72,8 @@
  * \retval 0 e1 > e2
  * \retval 1 e1 <= e2
  */
-static int crrn_req_compare(cfs_binheap_node_t *e1, cfs_binheap_node_t *e2)
+static int
+crrn_req_compare(struct cfs_binheap_node *e1, struct cfs_binheap_node *e2)
 {
 	struct ptlrpc_nrs_request *nrq1;
 	struct ptlrpc_nrs_request *nrq2;
@@ -88,7 +89,7 @@ static int crrn_req_compare(cfs_binheap_node_t *e1, cfs_binheap_node_t *e2)
 	return nrq1->nr_u.crr.cr_sequence < nrq2->nr_u.crr.cr_sequence;
 }
 
-static cfs_binheap_ops_t nrs_crrn_heap_ops = {
+static struct cfs_binheap_ops nrs_crrn_heap_ops = {
 	.hop_enter	= NULL,
 	.hop_exit	= NULL,
 	.hop_compare	= crrn_req_compare,
@@ -414,7 +415,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;
-	cfs_binheap_node_t	  *node = cfs_binheap_root(net->cn_binheap);
+	struct cfs_binheap_node	  *node = cfs_binheap_root(net->cn_binheap);
 	struct ptlrpc_nrs_request *nrq;
 
 	nrq = unlikely(node == NULL) ? NULL :
@@ -576,7 +577,7 @@ static void nrs_crrn_req_del(struct ptlrpc_nrs_policy *policy,
 	 */
 	if (unlikely(is_root)) {
 		/** Peek at the next request to be served */
-		cfs_binheap_node_t *node = cfs_binheap_root(net->cn_binheap);
+		struct cfs_binheap_node *node = cfs_binheap_root(net->cn_binheap);
 
 		/** No more requests */
 		if (unlikely(node == NULL)) {