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
b=18948 Speedy recovery
[fs/lustre-release.git]
/
lustre
/
mgs
/
mgs_handler.c
diff --git
a/lustre/mgs/mgs_handler.c
b/lustre/mgs/mgs_handler.c
index
3c5262e
..
deb9b1b
100644
(file)
--- a/
lustre/mgs/mgs_handler.c
+++ b/
lustre/mgs/mgs_handler.c
@@
-222,12
+222,16
@@
static int mgs_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
/* Internal mgs setup */
mgs_init_fsdb_list(obd);
/* Internal mgs setup */
mgs_init_fsdb_list(obd);
- sema_init(&mgs->mgs_sem, 1);
+
cfs_
sema_init(&mgs->mgs_sem, 1);
/* Setup proc */
lprocfs_mgs_init_vars(&lvars);
/* Setup proc */
lprocfs_mgs_init_vars(&lvars);
- if (lprocfs_obd_setup(obd, lvars.obd_vars) == 0)
+ if (lprocfs_obd_setup(obd, lvars.obd_vars) == 0)
{
lproc_mgs_setup(obd);
lproc_mgs_setup(obd);
+ rc = lprocfs_alloc_md_stats(obd, LPROC_MGS_LAST);
+ if (rc)
+ GOTO(err_llog, rc);
+ }
/* Start the service threads */
mgs->mgs_service =
/* Start the service threads */
mgs->mgs_service =
@@
-560,7
+564,7
@@
static int mgs_connect_check_sptlrpc(struct ptlrpc_request *req)
if (rc)
return rc;
if (rc)
return rc;
- down(&fsdb->fsdb_sem);
+
cfs_
down(&fsdb->fsdb_sem);
if (sptlrpc_rule_set_choose(&fsdb->fsdb_srpc_gen,
LUSTRE_SP_MGC, LUSTRE_SP_MGS,
req->rq_peer.nid,
if (sptlrpc_rule_set_choose(&fsdb->fsdb_srpc_gen,
LUSTRE_SP_MGC, LUSTRE_SP_MGS,
req->rq_peer.nid,
@@
-568,9
+572,9
@@
static int mgs_connect_check_sptlrpc(struct ptlrpc_request *req)
/* by defualt allow any flavors */
flvr.sf_rpc = SPTLRPC_FLVR_ANY;
}
/* by defualt allow any flavors */
flvr.sf_rpc = SPTLRPC_FLVR_ANY;
}
- up(&fsdb->fsdb_sem);
+
cfs_
up(&fsdb->fsdb_sem);
- spin_lock(&exp->exp_lock);
+
cfs_
spin_lock(&exp->exp_lock);
exp->exp_sp_peer = req->rq_sp_from;
exp->exp_flvr = flvr;
exp->exp_sp_peer = req->rq_sp_from;
exp->exp_flvr = flvr;
@@
-583,7
+587,7
@@
static int mgs_connect_check_sptlrpc(struct ptlrpc_request *req)
rc = -EACCES;
}
rc = -EACCES;
}
- spin_unlock(&exp->exp_lock);
+
cfs_
spin_unlock(&exp->exp_lock);
} else {
if (exp->exp_sp_peer != req->rq_sp_from) {
CERROR("RPC source %s doesn't match %s\n",
} else {
if (exp->exp_sp_peer != req->rq_sp_from) {
CERROR("RPC source %s doesn't match %s\n",
@@
-636,7
+640,7
@@
int mgs_handle(struct ptlrpc_request *req)
GOTO(out, rc = 0);
if (opc != MGS_CONNECT) {
GOTO(out, rc = 0);
if (opc != MGS_CONNECT) {
- if (
req->rq_export == NULL
) {
+ if (
!class_connected_export(req->rq_export)
) {
CERROR("lustre_mgs: operation %d on unconnected MGS\n",
opc);
req->rq_status = -ENOTCONN;
CERROR("lustre_mgs: operation %d on unconnected MGS\n",
opc);
req->rq_status = -ENOTCONN;
@@
-752,9
+756,9
@@
out:
static inline int mgs_init_export(struct obd_export *exp)
{
static inline int mgs_init_export(struct obd_export *exp)
{
- spin_lock(&exp->exp_lock);
+
cfs_
spin_lock(&exp->exp_lock);
exp->exp_connecting = 1;
exp->exp_connecting = 1;
- spin_unlock(&exp->exp_lock);
+
cfs_
spin_unlock(&exp->exp_lock);
return ldlm_init_export(exp);
}
return ldlm_init_export(exp);
}
@@
-827,7
+831,7
@@
static int mgs_iocontrol_pool(struct obd_device *obd,
if (lcfg == NULL)
GOTO(out_pool, rc = -ENOMEM);
if (lcfg == NULL)
GOTO(out_pool, rc = -ENOMEM);
- if (copy_from_user(lcfg, data->ioc_pbuf1, data->ioc_plen1))
+ if (c
fs_c
opy_from_user(lcfg, data->ioc_pbuf1, data->ioc_plen1))
GOTO(out_pool, rc = -EFAULT);
if (lcfg->lcfg_bufcount < 2) {
GOTO(out_pool, rc = -EFAULT);
if (lcfg->lcfg_bufcount < 2) {
@@
-927,7
+931,7
@@
int mgs_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
OBD_ALLOC(lcfg, data->ioc_plen1);
if (lcfg == NULL)
RETURN(-ENOMEM);
OBD_ALLOC(lcfg, data->ioc_plen1);
if (lcfg == NULL)
RETURN(-ENOMEM);
- if (copy_from_user(lcfg, data->ioc_pbuf1, data->ioc_plen1))
+ if (c
fs_c
opy_from_user(lcfg, data->ioc_pbuf1, data->ioc_plen1))
GOTO(out_free, rc = -EFAULT);
if (lcfg->lcfg_bufcount < 1)
GOTO(out_free, rc = -EFAULT);
if (lcfg->lcfg_bufcount < 1)