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-6084 ptlrpc: prevent request timeout grow due to recovery
[fs/lustre-release.git]
/
lustre
/
ptlrpc
/
nrs_crr.c
diff --git
a/lustre/ptlrpc/nrs_crr.c
b/lustre/ptlrpc/nrs_crr.c
index
8eeadc5
..
fa36c5a
100644
(file)
--- a/
lustre/ptlrpc/nrs_crr.c
+++ b/
lustre/ptlrpc/nrs_crr.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
*/
@@
-610,7
+610,7
@@
static void nrs_crrn_req_stop(struct ptlrpc_nrs_policy *policy,
libcfs_id2str(req->rq_peer), nrq->nr_u.crr.cr_round);
}
libcfs_id2str(req->rq_peer), nrq->nr_u.crr.cr_round);
}
-#ifdef
LPROC
FS
+#ifdef
CONFIG_PROC_
FS
/**
* lprocfs interface
/**
* lprocfs interface
@@
-819,7
+819,7
@@
LPROC_SEQ_FOPS(ptlrpc_lprocfs_nrs_crrn_quantum);
*/
static int nrs_crrn_lprocfs_init(struct ptlrpc_service *svc)
{
*/
static int nrs_crrn_lprocfs_init(struct ptlrpc_service *svc)
{
- struct lprocfs_
seq_
vars nrs_crrn_lprocfs_vars[] = {
+ struct lprocfs_vars nrs_crrn_lprocfs_vars[] = {
{ .name = "nrs_crrn_quantum",
.fops = &ptlrpc_lprocfs_nrs_crrn_quantum_fops,
.data = svc },
{ .name = "nrs_crrn_quantum",
.fops = &ptlrpc_lprocfs_nrs_crrn_quantum_fops,
.data = svc },
@@
-829,8
+829,7
@@
static int nrs_crrn_lprocfs_init(struct ptlrpc_service *svc)
if (svc->srv_procroot == NULL)
return 0;
if (svc->srv_procroot == NULL)
return 0;
- return lprocfs_seq_add_vars(svc->srv_procroot, nrs_crrn_lprocfs_vars,
- NULL);
+ return lprocfs_add_vars(svc->srv_procroot, nrs_crrn_lprocfs_vars, NULL);
}
/**
}
/**
@@
-846,7
+845,7
@@
static void nrs_crrn_lprocfs_fini(struct ptlrpc_service *svc)
lprocfs_remove_proc_entry("nrs_crrn_quantum", svc->srv_procroot);
}
lprocfs_remove_proc_entry("nrs_crrn_quantum", svc->srv_procroot);
}
-#endif /*
LPROC
FS */
+#endif /*
CONFIG_PROC_
FS */
/**
* CRR-N policy operations
/**
* CRR-N policy operations
@@
-861,7
+860,7
@@
static const struct ptlrpc_nrs_pol_ops nrs_crrn_ops = {
.op_req_enqueue = nrs_crrn_req_add,
.op_req_dequeue = nrs_crrn_req_del,
.op_req_stop = nrs_crrn_req_stop,
.op_req_enqueue = nrs_crrn_req_add,
.op_req_dequeue = nrs_crrn_req_del,
.op_req_stop = nrs_crrn_req_stop,
-#ifdef
LPROC
FS
+#ifdef
CONFIG_PROC_
FS
.op_lprocfs_init = nrs_crrn_lprocfs_init,
.op_lprocfs_fini = nrs_crrn_lprocfs_fini,
#endif
.op_lprocfs_init = nrs_crrn_lprocfs_init,
.op_lprocfs_fini = nrs_crrn_lprocfs_fini,
#endif