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-10308 misc: update Intel copyright messages for 2017
[fs/lustre-release.git]
/
lustre
/
ptlrpc
/
nrs_crr.c
diff --git
a/lustre/ptlrpc/nrs_crr.c
b/lustre/ptlrpc/nrs_crr.c
index
ea5e127
..
a909606
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) 201
1, 2014
, Intel Corporation.
+ * Copyright (c) 201
3, 2017
, Intel Corporation.
*
* Copyright 2012 Xyratex Technology Limited
*/
*
* Copyright 2012 Xyratex Technology Limited
*/
@@
-194,7
+194,7
@@
static int nrs_crrn_start(struct ptlrpc_nrs_policy *policy, char *arg)
nrs_pol2cptab(policy),
nrs_pol2cptid(policy));
if (net->cn_binheap == NULL)
nrs_pol2cptab(policy),
nrs_pol2cptid(policy));
if (net->cn_binheap == NULL)
- GOTO(
failed
, rc = -ENOMEM);
+ GOTO(
out_net
, rc = -ENOMEM);
net->cn_cli_hash = cfs_hash_create("nrs_crrn_nid_hash",
NRS_NID_BITS, NRS_NID_BITS,
net->cn_cli_hash = cfs_hash_create("nrs_crrn_nid_hash",
NRS_NID_BITS, NRS_NID_BITS,
@@
-204,7
+204,7
@@
static int nrs_crrn_start(struct ptlrpc_nrs_policy *policy, char *arg)
&nrs_crrn_hash_ops,
CFS_HASH_RW_BKTLOCK);
if (net->cn_cli_hash == NULL)
&nrs_crrn_hash_ops,
CFS_HASH_RW_BKTLOCK);
if (net->cn_cli_hash == NULL)
- GOTO(
failed
, rc = -ENOMEM);
+ GOTO(
out_binheap
, rc = -ENOMEM);
/**
* Set default quantum value to max_rpcs_in_flight for non-MDS OSCs;
/**
* Set default quantum value to max_rpcs_in_flight for non-MDS OSCs;
@@
-223,10
+223,9
@@
static int nrs_crrn_start(struct ptlrpc_nrs_policy *policy, char *arg)
RETURN(rc);
RETURN(rc);
-failed:
- if (net->cn_binheap != NULL)
- cfs_binheap_destroy(net->cn_binheap);
-
+out_binheap:
+ cfs_binheap_destroy(net->cn_binheap);
+out_net:
OBD_FREE_PTR(net);
RETURN(rc);
OBD_FREE_PTR(net);
RETURN(rc);
@@
-437,7
+436,7
@@
struct ptlrpc_nrs_request *nrs_crrn_req_get(struct ptlrpc_nrs_policy *policy,
CDEBUG(D_RPCTRACE,
"NRS: starting to handle %s request from %s, with round "
CDEBUG(D_RPCTRACE,
"NRS: starting to handle %s request from %s, with round "
-
LPU64"
\n", NRS_POL_NAME_CRRN,
+
"%llu
\n", NRS_POL_NAME_CRRN,
libcfs_id2str(req->rq_peer), nrq->nr_u.crr.cr_round);
/** Peek at the next request to be served */
libcfs_id2str(req->rq_peer), nrq->nr_u.crr.cr_round);
/** Peek at the next request to be served */
@@
-606,7
+605,7
@@
static void nrs_crrn_req_stop(struct ptlrpc_nrs_policy *policy,
rq_nrq);
CDEBUG(D_RPCTRACE,
rq_nrq);
CDEBUG(D_RPCTRACE,
- "NRS: finished handling %s request from %s, with round
"LPU64
+ "NRS: finished handling %s request from %s, with round
%llu"
"\n", NRS_POL_NAME_CRRN,
libcfs_id2str(req->rq_peer), nrq->nr_u.crr.cr_round);
}
"\n", NRS_POL_NAME_CRRN,
libcfs_id2str(req->rq_peer), nrq->nr_u.crr.cr_round);
}