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
Branch: HEAD
[fs/lustre-release.git]
/
lustre
/
mgc
/
mgc_request.c
diff --git
a/lustre/mgc/mgc_request.c
b/lustre/mgc/mgc_request.c
index
18ad5c3
..
e8ddf27
100644
(file)
--- a/
lustre/mgc/mgc_request.c
+++ b/
lustre/mgc/mgc_request.c
@@
-92,7
+92,7
@@
int mgc_logname2resid(char *logname, struct ldlm_res_id *res_id)
}
/********************** config llog list **********************/
}
/********************** config llog list **********************/
-static
struct list_head config_llog_list = LIST_HEAD_INIT
(config_llog_list);
+static
CFS_LIST_HEAD
(config_llog_list);
static spinlock_t config_list_lock = SPIN_LOCK_UNLOCKED;
/* Take a reference to a config log */
static spinlock_t config_list_lock = SPIN_LOCK_UNLOCKED;
/* Take a reference to a config log */
@@
-512,7
+512,7
@@
static int mgc_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
if (rc)
GOTO(err_decref, rc);
if (rc)
GOTO(err_decref, rc);
- rc = obd_llog_init(obd,
OBD_LLOG_GROUP
, obd, 0, NULL, NULL);
+ rc = obd_llog_init(obd,
&obd->obd_olg
, obd, 0, NULL, NULL);
if (rc) {
CERROR("failed to setup llogging subsystems\n");
GOTO(err_cleanup, rc);
if (rc) {
CERROR("failed to setup llogging subsystems\n");
GOTO(err_cleanup, rc);
@@
-528,7
+528,7
@@
static int mgc_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
cfs_waitq_init(&rq_waitq);
}
spin_unlock(&config_list_lock);
cfs_waitq_init(&rq_waitq);
}
spin_unlock(&config_list_lock);
-
+
RETURN(rc);
err_cleanup:
RETURN(rc);
err_cleanup:
@@
-814,7
+814,7
@@
int mgc_set_info_async(struct obd_export *exp, obd_count keylen,
RETURN(0);
}
/* FIXME move this to mgc_process_config */
RETURN(0);
}
/* FIXME move this to mgc_process_config */
- if (KEY_IS(
"register_target"
)) {
+ if (KEY_IS(
KEY_REGISTER_TARGET
)) {
struct mgs_target_info *mti;
if (vallen != sizeof(struct mgs_target_info))
RETURN(-EINVAL);
struct mgs_target_info *mti;
if (vallen != sizeof(struct mgs_target_info))
RETURN(-EINVAL);
@@
-824,7
+824,7
@@
int mgc_set_info_async(struct obd_export *exp, obd_count keylen,
rc = mgc_target_register(exp, mti);
RETURN(rc);
}
rc = mgc_target_register(exp, mti);
RETURN(rc);
}
- if (KEY_IS(
"set_fs"
)) {
+ if (KEY_IS(
KEY_SET_FS
)) {
struct super_block *sb = (struct super_block *)val;
struct lustre_sb_info *lsi;
if (vallen != sizeof(struct super_block))
struct super_block *sb = (struct super_block *)val;
struct lustre_sb_info *lsi;
if (vallen != sizeof(struct super_block))
@@
-836,7
+836,7
@@
int mgc_set_info_async(struct obd_export *exp, obd_count keylen,
}
RETURN(rc);
}
}
RETURN(rc);
}
- if (KEY_IS(
"clear_fs"
)) {
+ if (KEY_IS(
KEY_CLEAR_FS
)) {
if (vallen != 0)
RETURN(-EINVAL);
rc = mgc_fs_cleanup(exp->exp_obd);
if (vallen != 0)
RETURN(-EINVAL);
rc = mgc_fs_cleanup(exp->exp_obd);
@@
-868,7
+868,6
@@
static int mgc_import_event(struct obd_device *obd,
switch (event) {
case IMP_EVENT_DISCON:
/* MGC imports should not wait for recovery */
switch (event) {
case IMP_EVENT_DISCON:
/* MGC imports should not wait for recovery */
- ptlrpc_invalidate_import(imp);
break;
case IMP_EVENT_INACTIVE:
break;
break;
case IMP_EVENT_INACTIVE:
break;
@@
-891,17
+890,15
@@
static int mgc_import_event(struct obd_device *obd,
RETURN(rc);
}
RETURN(rc);
}
-static int mgc_llog_init(struct obd_device *obd,
int group
,
+static int mgc_llog_init(struct obd_device *obd,
struct obd_llog_group *olg
,
struct obd_device *tgt, int count,
struct llog_catid *logid, struct obd_uuid *uuid)
{
struct llog_ctxt *ctxt;
struct obd_device *tgt, int count,
struct llog_catid *logid, struct obd_uuid *uuid)
{
struct llog_ctxt *ctxt;
- struct obd_llog_group *olg = &obd->obd_olg;
int rc;
ENTRY;
int rc;
ENTRY;
- LASSERT(group == OBD_LLOG_GROUP);
- LASSERT(olg->olg_group == group);
+ LASSERT(olg == &obd->obd_olg);
rc = llog_setup(obd, olg, LLOG_CONFIG_ORIG_CTXT, tgt, 0, NULL,
&llog_lvfs_ops);
rc = llog_setup(obd, olg, LLOG_CONFIG_ORIG_CTXT, tgt, 0, NULL,
&llog_lvfs_ops);