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
New tag 2.15.91
[fs/lustre-release.git]
/
lustre
/
ptlrpc
/
nrs_fifo.c
diff --git
a/lustre/ptlrpc/nrs_fifo.c
b/lustre/ptlrpc/nrs_fifo.c
index
f407866
..
177f90f
100644
(file)
--- a/
lustre/ptlrpc/nrs_fifo.c
+++ b/
lustre/ptlrpc/nrs_fifo.c
@@
-20,7
+20,7
@@
* GPL HEADER END
*/
/*
* GPL HEADER END
*/
/*
- * Copyright (c) 2011
Intel Corporation
+ * Copyright (c) 2011
, 2014, Intel Corporation.
*
* Copyright 2012 Xyratex Technology Limited
*/
*
* Copyright 2012 Xyratex Technology Limited
*/
@@
-47,9
+47,6
@@
*/
#define DEBUG_SUBSYSTEM S_RPC
*/
#define DEBUG_SUBSYSTEM S_RPC
-#ifndef __KERNEL__
-#include <liblustre.h>
-#endif
#include <obd_support.h>
#include <obd_class.h>
#include <libcfs/libcfs.h>
#include <obd_support.h>
#include <obd_class.h>
#include <libcfs/libcfs.h>
@@
-166,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,
@@
-177,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);
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,
"\n", policy->pol_desc->pd_name,
- libcfs_id
2str(
req->rq_peer), nrq->nr_u.fifo.fr_sequence);
+ libcfs_id
str(&
req->rq_peer), nrq->nr_u.fifo.fr_sequence);
}
return nrq;
}
return nrq;
@@
-239,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);
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_id
2str(
req->rq_peer),
+ CDEBUG(D_RPCTRACE, "NRS stop %s request from %s, seq:
%llu
\n",
+ policy->pol_desc->pd_name, libcfs_id
str(&
req->rq_peer),
nrq->nr_u.fifo.fr_sequence);
}
nrq->nr_u.fifo.fr_sequence);
}