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-2059 mgs: don't fail on missing params log
[fs/lustre-release.git]
/
lustre
/
ptlrpc
/
nrs_crr.c
diff --git
a/lustre/ptlrpc/nrs_crr.c
b/lustre/ptlrpc/nrs_crr.c
index
134b88e
..
e0f1e8d
100644
(file)
--- a/
lustre/ptlrpc/nrs_crr.c
+++ b/
lustre/ptlrpc/nrs_crr.c
@@
-139,7
+139,7
@@
static void nrs_crrn_hop_get(cfs_hash_t *hs, cfs_hlist_node_t *hnode)
struct nrs_crrn_client *cli = cfs_hlist_entry(hnode,
struct nrs_crrn_client,
cc_hnode);
struct nrs_crrn_client *cli = cfs_hlist_entry(hnode,
struct nrs_crrn_client,
cc_hnode);
-
cfs_
atomic_inc(&cli->cc_ref);
+ atomic_inc(&cli->cc_ref);
}
static void nrs_crrn_hop_put(cfs_hash_t *hs, cfs_hlist_node_t *hnode)
}
static void nrs_crrn_hop_put(cfs_hash_t *hs, cfs_hlist_node_t *hnode)
@@
-147,7
+147,7
@@
static void nrs_crrn_hop_put(cfs_hash_t *hs, cfs_hlist_node_t *hnode)
struct nrs_crrn_client *cli = cfs_hlist_entry(hnode,
struct nrs_crrn_client,
cc_hnode);
struct nrs_crrn_client *cli = cfs_hlist_entry(hnode,
struct nrs_crrn_client,
cc_hnode);
-
cfs_
atomic_dec(&cli->cc_ref);
+ atomic_dec(&cli->cc_ref);
}
static void nrs_crrn_hop_exit(cfs_hash_t *hs, cfs_hlist_node_t *hnode)
}
static void nrs_crrn_hop_exit(cfs_hash_t *hs, cfs_hlist_node_t *hnode)
@@
-155,9
+155,9
@@
static void nrs_crrn_hop_exit(cfs_hash_t *hs, cfs_hlist_node_t *hnode)
struct nrs_crrn_client *cli = cfs_hlist_entry(hnode,
struct nrs_crrn_client,
cc_hnode);
struct nrs_crrn_client *cli = cfs_hlist_entry(hnode,
struct nrs_crrn_client,
cc_hnode);
- LASSERTF(
cfs_
atomic_read(&cli->cc_ref) == 0,
+ LASSERTF(atomic_read(&cli->cc_ref) == 0,
"Busy CRR-N object from client with NID %s, with %d refs\n",
"Busy CRR-N object from client with NID %s, with %d refs\n",
- libcfs_nid2str(cli->cc_nid),
cfs_
atomic_read(&cli->cc_ref));
+ libcfs_nid2str(cli->cc_nid), atomic_read(&cli->cc_ref));
OBD_FREE_PTR(cli);
}
OBD_FREE_PTR(cli);
}
@@
-181,7
+181,7
@@
static cfs_hash_ops_t nrs_crrn_hash_ops = {
* \retval -ENOMEM OOM error
* \retval 0 success
*/
* \retval -ENOMEM OOM error
* \retval 0 success
*/
-static int nrs_crrn_start(struct ptlrpc_nrs_policy *policy)
+static int nrs_crrn_start(struct ptlrpc_nrs_policy *policy
, char *arg
)
{
struct nrs_crrn_net *net;
int rc = 0;
{
struct nrs_crrn_net *net;
int rc = 0;
@@
-214,7
+214,7
@@
static int nrs_crrn_start(struct ptlrpc_nrs_policy *policy)
* with the default max_rpcs_in_flight value, as we are scheduling over
* NIDs, and there may be more than one mount point per client.
*/
* with the default max_rpcs_in_flight value, as we are scheduling over
* NIDs, and there may be more than one mount point per client.
*/
- net->cn_quantum = O
SC
_MAX_RIF_DEFAULT;
+ net->cn_quantum = O
BD
_MAX_RIF_DEFAULT;
/**
* Set to 1 so that the test inside nrs_crrn_req_add() can evaluate to
* true.
/**
* Set to 1 so that the test inside nrs_crrn_req_add() can evaluate to
* true.
@@
-267,8
+267,8
@@
static void nrs_crrn_stop(struct ptlrpc_nrs_policy *policy)
* \param[in] opc the opcode
* \param[in,out] arg used for passing parameters and information
*
* \param[in] opc the opcode
* \param[in,out] arg used for passing parameters and information
*
- * \pre
spin_is
_locked(&policy->pol_nrs->->nrs_lock)
- * \post
spin_is
_locked(&policy->pol_nrs->->nrs_lock)
+ * \pre
assert_spin
_locked(&policy->pol_nrs->->nrs_lock)
+ * \post
assert_spin
_locked(&policy->pol_nrs->->nrs_lock)
*
* \retval 0 operation carried out successfully
* \retval -ve error
*
* \retval 0 operation carried out successfully
* \retval -ve error
@@
-276,7
+276,7
@@
static void nrs_crrn_stop(struct ptlrpc_nrs_policy *policy)
int nrs_crrn_ctl(struct ptlrpc_nrs_policy *policy, enum ptlrpc_nrs_ctl opc,
void *arg)
{
int nrs_crrn_ctl(struct ptlrpc_nrs_policy *policy, enum ptlrpc_nrs_ctl opc,
void *arg)
{
-
LASSERT(spin_is_locked(&policy->pol_nrs->nrs_lock)
);
+
assert_spin_locked(&policy->pol_nrs->nrs_lock
);
switch((enum nrs_ctl_crr)opc) {
default:
switch((enum nrs_ctl_crr)opc) {
default:
@@
-352,14
+352,13
@@
int nrs_crrn_res_get(struct ptlrpc_nrs_policy *policy,
goto out;
OBD_CPT_ALLOC_GFP(cli, nrs_pol2cptab(policy), nrs_pol2cptid(policy),
goto out;
OBD_CPT_ALLOC_GFP(cli, nrs_pol2cptab(policy), nrs_pol2cptid(policy),
- sizeof(*cli), moving_req ? GFP_ATOMIC :
- __GFP_IO);
+ sizeof(*cli), moving_req ? GFP_ATOMIC : GFP_NOFS);
if (cli == NULL)
return -ENOMEM;
cli->cc_nid = req->rq_peer.nid;
if (cli == NULL)
return -ENOMEM;
cli->cc_nid = req->rq_peer.nid;
-
cfs_
atomic_set(&cli->cc_ref, 1);
+ atomic_set(&cli->cc_ref, 1);
tmp = cfs_hash_findadd_unique(net->cn_cli_hash, &cli->cc_nid,
&cli->cc_hnode);
if (tmp != cli) {
tmp = cfs_hash_findadd_unique(net->cn_cli_hash, &cli->cc_nid,
&cli->cc_hnode);
if (tmp != cli) {
@@
-633,14
+632,12
@@
static void nrs_crrn_req_stop(struct ptlrpc_nrs_policy *policy,
* reg_quantum:8
* hp_quantum:4
*/
* reg_quantum:8
* hp_quantum:4
*/
-static int ptlrpc_lprocfs_rd_nrs_crrn_quantum(char *page, char **start,
- off_t off, int count, int *eof,
- void *data)
+static int
+ptlrpc_lprocfs_nrs_crrn_quantum_seq_show(struct seq_file *m, void *data)
{
{
- struct ptlrpc_service *svc = data;
- __u16 quantum;
- int rc;
- int rc2 = 0;
+ struct ptlrpc_service *svc = m->private;
+ __u16 quantum;
+ int rc;
/**
* Perform two separate calls to this as only one of the NRS heads'
/**
* Perform two separate calls to this as only one of the NRS heads'
@@
-652,9
+649,8
@@
static int ptlrpc_lprocfs_rd_nrs_crrn_quantum(char *page, char **start,
NRS_CTL_CRRN_RD_QUANTUM,
true, &quantum);
if (rc == 0) {
NRS_CTL_CRRN_RD_QUANTUM,
true, &quantum);
if (rc == 0) {
- *eof = 1;
- rc2 = snprintf(page, count, NRS_LPROCFS_QUANTUM_NAME_REG
- "%-5d\n", quantum);
+ seq_printf(m, NRS_LPROCFS_QUANTUM_NAME_REG
+ "%-5d\n", quantum);
/**
* Ignore -ENODEV as the regular NRS head's policy may be in the
* ptlrpc_nrs_pol_state::NRS_POL_STATE_STOPPED state.
/**
* Ignore -ENODEV as the regular NRS head's policy may be in the
* ptlrpc_nrs_pol_state::NRS_POL_STATE_STOPPED state.
@@
-671,9
+667,7
@@
static int ptlrpc_lprocfs_rd_nrs_crrn_quantum(char *page, char **start,
NRS_CTL_CRRN_RD_QUANTUM,
true, &quantum);
if (rc == 0) {
NRS_CTL_CRRN_RD_QUANTUM,
true, &quantum);
if (rc == 0) {
- *eof = 1;
- rc2 += snprintf(page + rc2, count - rc2,
- NRS_LPROCFS_QUANTUM_NAME_HP"%-5d\n", quantum);
+ seq_printf(m, NRS_LPROCFS_QUANTUM_NAME_HP"%-5d\n", quantum);
/**
* Ignore -ENODEV as the high priority NRS head's policy may be
* in the ptlrpc_nrs_pol_state::NRS_POL_STATE_STOPPED state.
/**
* Ignore -ENODEV as the high priority NRS head's policy may be
* in the ptlrpc_nrs_pol_state::NRS_POL_STATE_STOPPED state.
@@
-683,8
+677,7
@@
static int ptlrpc_lprocfs_rd_nrs_crrn_quantum(char *page, char **start,
}
no_hp:
}
no_hp:
-
- return rc2 ? : rc;
+ return rc;
}
/**
}
/**
@@
-707,11
+700,12
@@
no_hp:
* policy instances in the ptlrpc_nrs_pol_state::NRS_POL_STATE_STOPPED state
* are skipped later by nrs_crrn_ctl().
*/
* policy instances in the ptlrpc_nrs_pol_state::NRS_POL_STATE_STOPPED state
* are skipped later by nrs_crrn_ctl().
*/
-static int ptlrpc_lprocfs_wr_nrs_crrn_quantum(struct file *file,
- const char *buffer,
- unsigned long count, void *data)
+static ssize_t
+ptlrpc_lprocfs_nrs_crrn_quantum_seq_write(struct file *file,
+ const char *buffer, size_t count,
+ loff_t *off)
{
{
- struct ptlrpc_service *svc =
data
;
+ struct ptlrpc_service *svc =
((struct seq_file *)file->private_data)->private
;
enum ptlrpc_nrs_queue_type queue = 0;
char kernbuf[LPROCFS_NRS_WR_QUANTUM_MAX_CMD];
char *val;
enum ptlrpc_nrs_queue_type queue = 0;
char kernbuf[LPROCFS_NRS_WR_QUANTUM_MAX_CMD];
char *val;
@@
-815,6
+809,7
@@
static int ptlrpc_lprocfs_wr_nrs_crrn_quantum(struct file *file,
return rc == -ENODEV && rc2 == -ENODEV ? -ENODEV : count;
}
return rc == -ENODEV && rc2 == -ENODEV ? -ENODEV : count;
}
+LPROC_SEQ_FOPS(ptlrpc_lprocfs_nrs_crrn_quantum);
/**
* Initializes a CRR-N policy's lprocfs interface for service \a svc
/**
* Initializes a CRR-N policy's lprocfs interface for service \a svc
@@
-826,12
+821,9
@@
static int ptlrpc_lprocfs_wr_nrs_crrn_quantum(struct file *file,
*/
int nrs_crrn_lprocfs_init(struct ptlrpc_service *svc)
{
*/
int nrs_crrn_lprocfs_init(struct ptlrpc_service *svc)
{
- int rc;
-
- struct lprocfs_vars nrs_crrn_lprocfs_vars[] = {
+ struct lprocfs_seq_vars nrs_crrn_lprocfs_vars[] = {
{ .name = "nrs_crrn_quantum",
{ .name = "nrs_crrn_quantum",
- .read_fptr = ptlrpc_lprocfs_rd_nrs_crrn_quantum,
- .write_fptr = ptlrpc_lprocfs_wr_nrs_crrn_quantum,
+ .fops = &ptlrpc_lprocfs_nrs_crrn_quantum_fops,
.data = svc },
{ NULL }
};
.data = svc },
{ NULL }
};
@@
-839,9
+831,8
@@
int nrs_crrn_lprocfs_init(struct ptlrpc_service *svc)
if (svc->srv_procroot == NULL)
return 0;
if (svc->srv_procroot == NULL)
return 0;
- rc = lprocfs_add_vars(svc->srv_procroot, nrs_crrn_lprocfs_vars, NULL);
-
- return rc;
+ return lprocfs_seq_add_vars(svc->srv_procroot, nrs_crrn_lprocfs_vars,
+ NULL);
}
/**
}
/**