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 369b599..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;
 
-       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,