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-14651 uapi: rename CONFIG_T_* to MGS_CFG_T_*
[fs/lustre-release.git]
/
lustre
/
mgs
/
mgs_handler.c
diff --git
a/lustre/mgs/mgs_handler.c
b/lustre/mgs/mgs_handler.c
index
be44842
..
3de752a
100644
(file)
--- a/
lustre/mgs/mgs_handler.c
+++ b/
lustre/mgs/mgs_handler.c
@@
-210,7
+210,8
@@
static int mgs_completion_ast_barrier(struct ldlm_lock *lock, __u64 flags,
return mgs_completion_ast_generic(lock, flags, cbdata, AST_BARRIER);
}
return mgs_completion_ast_generic(lock, flags, cbdata, AST_BARRIER);
}
-void mgs_revoke_lock(struct mgs_device *mgs, struct fs_db *fsdb, int type)
+void mgs_revoke_lock(struct mgs_device *mgs, struct fs_db *fsdb,
+ enum mgs_cfg_type type)
{
ldlm_completion_callback cp = NULL;
struct lustre_handle lockh = {
{
ldlm_completion_callback cp = NULL;
struct lustre_handle lockh = {
@@
-225,21
+226,21
@@
void mgs_revoke_lock(struct mgs_device *mgs, struct fs_db *fsdb, int type)
rc = mgc_fsname2resid(fsdb->fsdb_name, &res_id, type);
LASSERT(rc == 0);
switch (type) {
rc = mgc_fsname2resid(fsdb->fsdb_name, &res_id, type);
LASSERT(rc == 0);
switch (type) {
- case
CONFI
G_T_CONFIG:
- case
CONFI
G_T_NODEMAP:
+ case
MGS_CF
G_T_CONFIG:
+ case
MGS_CF
G_T_NODEMAP:
cp = mgs_completion_ast_config;
if (test_and_set_bit(FSDB_REVOKING_LOCK, &fsdb->fsdb_flags))
rc = -EALREADY;
break;
cp = mgs_completion_ast_config;
if (test_and_set_bit(FSDB_REVOKING_LOCK, &fsdb->fsdb_flags))
rc = -EALREADY;
break;
- case
CONFI
G_T_PARAMS:
+ case
MGS_CF
G_T_PARAMS:
cp = mgs_completion_ast_params;
if (test_and_set_bit(FSDB_REVOKING_PARAMS, &fsdb->fsdb_flags))
rc = -EALREADY;
break;
cp = mgs_completion_ast_params;
if (test_and_set_bit(FSDB_REVOKING_PARAMS, &fsdb->fsdb_flags))
rc = -EALREADY;
break;
- case
CONFI
G_T_RECOVER:
+ case
MGS_CF
G_T_RECOVER:
cp = mgs_completion_ast_ir;
break;
cp = mgs_completion_ast_ir;
break;
- case
CONFI
G_T_BARRIER:
+ case
MGS_CF
G_T_BARRIER:
cp = mgs_completion_ast_barrier;
break;
default:
cp = mgs_completion_ast_barrier;
break;
default:
@@
-259,11
+260,11
@@
void mgs_revoke_lock(struct mgs_device *mgs, struct fs_db *fsdb, int type)
le64_to_cpu(res_id.name[0]),
le64_to_cpu(res_id.name[1]), rc);
le64_to_cpu(res_id.name[0]),
le64_to_cpu(res_id.name[1]), rc);
- if (type ==
CONFI
G_T_CONFIG)
+ if (type ==
MGS_CF
G_T_CONFIG)
clear_bit(FSDB_REVOKING_LOCK,
&fsdb->fsdb_flags);
clear_bit(FSDB_REVOKING_LOCK,
&fsdb->fsdb_flags);
- if (type ==
CONFI
G_T_PARAMS)
+ if (type ==
MGS_CF
G_T_PARAMS)
clear_bit(FSDB_REVOKING_PARAMS,
&fsdb->fsdb_flags);
}
clear_bit(FSDB_REVOKING_PARAMS,
&fsdb->fsdb_flags);
}
@@
-509,7
+510,7
@@
static int mgs_target_reg(struct tgt_session_info *tsi)
}
out:
}
out:
- mgs_revoke_lock(mgs, c_fsdb,
CONFI
G_T_CONFIG);
+ mgs_revoke_lock(mgs, c_fsdb,
MGS_CF
G_T_CONFIG);
out_norevoke:
if (!rc && mti->mti_flags & LDD_F_SV_TYPE_MDT && b_fsdb) {
out_norevoke:
if (!rc && mti->mti_flags & LDD_F_SV_TYPE_MDT && b_fsdb) {
@@
-574,13
+575,13
@@
static int mgs_config_read(struct tgt_session_info *tsi)
}
switch (body->mcb_type) {
}
switch (body->mcb_type) {
- case
CONFI
G_T_RECOVER:
+ case
MGS_CF
G_T_RECOVER:
rc = mgs_get_ir_logs(req);
break;
rc = mgs_get_ir_logs(req);
break;
- case
CONFI
G_T_NODEMAP:
+ case
MGS_CF
G_T_NODEMAP:
rc = nodemap_get_config_req(req->rq_export->exp_obd, req);
break;
rc = nodemap_get_config_req(req->rq_export->exp_obd, req);
break;
- case
CONFI
G_T_CONFIG:
+ case
MGS_CF
G_T_CONFIG:
rc = -EOPNOTSUPP;
break;
default:
rc = -EOPNOTSUPP;
break;
default:
@@
-877,7
+878,7
@@
static int mgs_iocontrol_nodemap(const struct lu_env *env,
CWARN("%s: cannot make nodemap fsdb: rc = %d\n",
mgs->mgs_obd->obd_name, rc);
} else {
CWARN("%s: cannot make nodemap fsdb: rc = %d\n",
mgs->mgs_obd->obd_name, rc);
} else {
- mgs_revoke_lock(mgs, fsdb,
CONFI
G_T_NODEMAP);
+ mgs_revoke_lock(mgs, fsdb,
MGS_CF
G_T_NODEMAP);
mgs_put_fsdb(mgs, fsdb);
}
mgs_put_fsdb(mgs, fsdb);
}