X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmgs%2Fmgs_handler.c;fp=lustre%2Fmgs%2Fmgs_handler.c;h=3de752a018283d7cff375fd75c679fe12b2cb6f5;hb=4d5a2eba617780eadf172cb5c1fc28d5ab023a97;hp=be44842d4a8be59603378a203a80dc949701957f;hpb=cd4caef54f63b6a0d26a90d879f378b7fe3d4862;p=fs%2Flustre-release.git

diff --git a/lustre/mgs/mgs_handler.c b/lustre/mgs/mgs_handler.c
index be44842..3de752a 100644
--- 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);
 }
 
-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 = {
@@ -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) {
-	case CONFIG_T_CONFIG:
-	case CONFIG_T_NODEMAP:
+	case MGS_CFG_T_CONFIG:
+	case MGS_CFG_T_NODEMAP:
 		cp = mgs_completion_ast_config;
 		if (test_and_set_bit(FSDB_REVOKING_LOCK, &fsdb->fsdb_flags))
 			rc = -EALREADY;
 		break;
-	case CONFIG_T_PARAMS:
+	case MGS_CFG_T_PARAMS:
 		cp = mgs_completion_ast_params;
 		if (test_and_set_bit(FSDB_REVOKING_PARAMS, &fsdb->fsdb_flags))
 			rc = -EALREADY;
 		break;
-	case CONFIG_T_RECOVER:
+	case MGS_CFG_T_RECOVER:
 		cp = mgs_completion_ast_ir;
 		break;
-	case CONFIG_T_BARRIER:
+	case MGS_CFG_T_BARRIER:
 		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);
 
-			if (type == CONFIG_T_CONFIG)
+			if (type == MGS_CFG_T_CONFIG)
 				clear_bit(FSDB_REVOKING_LOCK,
 					  &fsdb->fsdb_flags);
 
-			if (type == CONFIG_T_PARAMS)
+			if (type == MGS_CFG_T_PARAMS)
 				clear_bit(FSDB_REVOKING_PARAMS,
 					  &fsdb->fsdb_flags);
 		}
@@ -509,7 +510,7 @@ static int mgs_target_reg(struct tgt_session_info *tsi)
         }
 
 out:
-	mgs_revoke_lock(mgs, c_fsdb, CONFIG_T_CONFIG);
+	mgs_revoke_lock(mgs, c_fsdb, MGS_CFG_T_CONFIG);
 
 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) {
-	case CONFIG_T_RECOVER:
+	case MGS_CFG_T_RECOVER:
 		rc = mgs_get_ir_logs(req);
 		break;
-	case CONFIG_T_NODEMAP:
+	case MGS_CFG_T_NODEMAP:
 		rc = nodemap_get_config_req(req->rq_export->exp_obd, req);
 		break;
-	case CONFIG_T_CONFIG:
+	case MGS_CFG_T_CONFIG:
 		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 {
-		mgs_revoke_lock(mgs, fsdb, CONFIG_T_NODEMAP);
+		mgs_revoke_lock(mgs, fsdb, MGS_CFG_T_NODEMAP);
 		mgs_put_fsdb(mgs, fsdb);
 	}