X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fnrs_fifo.c;h=369b59978b47ff5dc7425464ae5018705a2b58c1;hb=HEAD;hp=6b156da34c3671524480636a477698d4a89083d8;hpb=1f1d3a376d488d715dd1b0c94d5b66ea05c1e6ca;p=fs%2Flustre-release.git

diff --git a/lustre/ptlrpc/nrs_fifo.c b/lustre/ptlrpc/nrs_fifo.c
index 6b156da..177f90f 100644
--- a/lustre/ptlrpc/nrs_fifo.c
+++ b/lustre/ptlrpc/nrs_fifo.c
@@ -20,7 +20,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2011 Intel Corporation
+ * Copyright (c) 2011, 2014, Intel Corporation.
  *
  * Copyright 2012 Xyratex Technology Limited
  */
@@ -163,9 +163,9 @@ struct ptlrpc_nrs_request * nrs_fifo_req_get(struct ptlrpc_nrs_policy *policy,
 	struct nrs_fifo_head	  *head = policy->pol_private;
 	struct ptlrpc_nrs_request *nrq;
 
-	nrq = unlikely(list_empty(&head->fh_list)) ? NULL :
-	      list_entry(head->fh_list.next, struct ptlrpc_nrs_request,
-			     nr_u.fifo.fr_list);
+	nrq = list_first_entry_or_null(&head->fh_list,
+				       struct ptlrpc_nrs_request,
+				       nr_u.fifo.fr_list);
 
 	if (likely(!peek && nrq != NULL)) {
 		struct ptlrpc_request *req = container_of(nrq,
@@ -174,9 +174,9 @@ struct ptlrpc_nrs_request * nrs_fifo_req_get(struct ptlrpc_nrs_policy *policy,
 
 		list_del_init(&nrq->nr_u.fifo.fr_list);
 
-		CDEBUG(D_RPCTRACE, "NRS start %s request from %s, seq: "LPU64
+		CDEBUG(D_RPCTRACE, "NRS start %s request from %s, seq: %llu"
 		       "\n", policy->pol_desc->pd_name,
-		       libcfs_id2str(req->rq_peer), nrq->nr_u.fifo.fr_sequence);
+		       libcfs_idstr(&req->rq_peer), nrq->nr_u.fifo.fr_sequence);
 	}
 
 	return nrq;
@@ -236,8 +236,8 @@ static void nrs_fifo_req_stop(struct ptlrpc_nrs_policy *policy,
 	struct ptlrpc_request *req = container_of(nrq, struct ptlrpc_request,
 						  rq_nrq);
 
-	CDEBUG(D_RPCTRACE, "NRS stop %s request from %s, seq: "LPU64"\n",
-	       policy->pol_desc->pd_name, libcfs_id2str(req->rq_peer),
+	CDEBUG(D_RPCTRACE, "NRS stop %s request from %s, seq: %llu\n",
+	       policy->pol_desc->pd_name, libcfs_idstr(&req->rq_peer),
 	       nrq->nr_u.fifo.fr_sequence);
 }