Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-6142 lustre: use list_first_entry() in lustre subdirectory.
[fs/lustre-release.git]
/
lustre
/
ptlrpc
/
nrs_fifo.c
diff --git
a/lustre/ptlrpc/nrs_fifo.c
b/lustre/ptlrpc/nrs_fifo.c
index
e7e52d2
..
2142ff4
100644
(file)
--- a/
lustre/ptlrpc/nrs_fifo.c
+++ b/
lustre/ptlrpc/nrs_fifo.c
@@
-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;
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,
if (likely(!peek && nrq != NULL)) {
struct ptlrpc_request *req = container_of(nrq,
@@
-174,7
+174,7
@@
struct ptlrpc_nrs_request * nrs_fifo_req_get(struct ptlrpc_nrs_policy *policy,
list_del_init(&nrq->nr_u.fifo.fr_list);
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);
}
"\n", policy->pol_desc->pd_name,
libcfs_id2str(req->rq_peer), nrq->nr_u.fifo.fr_sequence);
}
@@
-236,7
+236,7
@@
static void nrs_fifo_req_stop(struct ptlrpc_nrs_policy *policy,
struct ptlrpc_request *req = container_of(nrq, struct ptlrpc_request,
rq_nrq);
struct ptlrpc_request *req = container_of(nrq, struct ptlrpc_request,
rq_nrq);
- CDEBUG(D_RPCTRACE, "NRS stop %s request from %s, seq:
"LPU64"
\n",
+ CDEBUG(D_RPCTRACE, "NRS stop %s request from %s, seq:
%llu
\n",
policy->pol_desc->pd_name, libcfs_id2str(req->rq_peer),
nrq->nr_u.fifo.fr_sequence);
}
policy->pol_desc->pd_name, libcfs_id2str(req->rq_peer),
nrq->nr_u.fifo.fr_sequence);
}