From: wangdi Date: Fri, 27 Sep 2013 15:14:10 +0000 (-0700) Subject: LU-1445 fld: change md_site to seq_server_site X-Git-Tag: 2.3.59~26 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=9b922184db95a042f465612baeb5924f19d2ae7a LU-1445 fld: change md_site to seq_server_site Change md_site to seq_server_site, so both Metadata and data stack will use this structure for sequence service. Signed-off-by: wang di Change-Id: I1f9c835d7006c4d336153c9bf8cac7d6fc729def Reviewed-on: http://review.whamcloud.com/4805 Tested-by: Hudson Reviewed-by: Andreas Dilger Reviewed-by: Mike Pershin Reviewed-by: Alex Zhuravlev Tested-by: Maloo --- diff --git a/lustre/fid/fid_handler.c b/lustre/fid/fid_handler.c index 8e833bb..d4c2611 100644 --- a/lustre/fid/fid_handler.c +++ b/lustre/fid/fid_handler.c @@ -89,9 +89,9 @@ int seq_server_set_cli(struct lu_server_seq *seq, CDEBUG(D_INFO, "%s: Attached sequence controller %s\n", seq->lss_name, cli->lcs_name); - seq->lss_cli = cli; - cli->lcs_space.lsr_index = seq->lss_site->ms_node_id; - EXIT; + seq->lss_cli = cli; + cli->lcs_space.lsr_index = seq->lss_site->ss_node_id; + EXIT; out_up: mutex_unlock(&seq->lss_mutex); return rc; @@ -203,7 +203,7 @@ static int range_alloc_set(const struct lu_env *env, if (range_is_exhausted(loset)) { /* reached high water mark. */ - struct lu_device *dev = seq->lss_site->ms_lu->ls_top_dev; + struct lu_device *dev = seq->lss_site->ss_lu->ls_top_dev; int obd_num_clients = dev->ld_obd->obd_num_exports; __u64 set_sz; @@ -293,34 +293,34 @@ static int seq_server_handle(struct lu_site *site, const struct lu_env *env, __u32 opc, struct lu_seq_range *out) { - int rc; - struct md_site *mite; - ENTRY; + int rc; + struct seq_server_site *ss_site; + ENTRY; - mite = lu_site2md(site); - switch (opc) { - case SEQ_ALLOC_META: - if (!mite->ms_server_seq) { - CERROR("Sequence server is not " - "initialized\n"); - RETURN(-EINVAL); - } - rc = seq_server_alloc_meta(mite->ms_server_seq, out, env); - break; - case SEQ_ALLOC_SUPER: - if (!mite->ms_control_seq) { - CERROR("Sequence controller is not " - "initialized\n"); - RETURN(-EINVAL); - } - rc = seq_server_alloc_super(mite->ms_control_seq, out, env); - break; - default: - rc = -EINVAL; - break; - } + ss_site = lu_site2seq(site); + switch (opc) { + case SEQ_ALLOC_META: + if (!ss_site->ss_server_seq) { + CERROR("Sequence server is not " + "initialized\n"); + RETURN(-EINVAL); + } + rc = seq_server_alloc_meta(ss_site->ss_server_seq, out, env); + break; + case SEQ_ALLOC_SUPER: + if (!ss_site->ss_control_seq) { + CERROR("Sequence controller is not " + "initialized\n"); + RETURN(-EINVAL); + } + rc = seq_server_alloc_super(ss_site->ss_control_seq, out, env); + break; + default: + rc = -EINVAL; + break; + } - RETURN(rc); + RETURN(rc); } static int seq_req_handle(struct ptlrpc_request *req, @@ -467,24 +467,24 @@ static void seq_server_proc_fini(struct lu_server_seq *seq) int seq_server_init(struct lu_server_seq *seq, - struct dt_device *dev, - const char *prefix, - enum lu_mgr_type type, - struct md_site *ms, - const struct lu_env *env) + struct dt_device *dev, + const char *prefix, + enum lu_mgr_type type, + struct seq_server_site *ss, + const struct lu_env *env) { int rc, is_srv = (type == LUSTRE_SEQ_SERVER); ENTRY; LASSERT(dev != NULL); LASSERT(prefix != NULL); - LASSERT(ms != NULL); - LASSERT(ms->ms_lu != NULL); + LASSERT(ss != NULL); + LASSERT(ss->ss_lu != NULL); - seq->lss_cli = NULL; - seq->lss_type = type; - seq->lss_site = ms; - range_init(&seq->lss_space); + seq->lss_cli = NULL; + seq->lss_type = type; + seq->lss_site = ss; + range_init(&seq->lss_space); range_init(&seq->lss_lowater_set); range_init(&seq->lss_hiwater_set); @@ -510,7 +510,7 @@ int seq_server_init(struct lu_server_seq *seq, LUSTRE_SEQ_ZERO_RANGE: LUSTRE_SEQ_SPACE_RANGE; - seq->lss_space.lsr_index = ms->ms_node_id; + seq->lss_space.lsr_index = ss->ss_node_id; LCONSOLE_INFO("%s: No data found " "on store. Initialize space\n", seq->lss_name); diff --git a/lustre/fid/fid_store.c b/lustre/fid/fid_store.c index eff79a4..0ba88b8 100644 --- a/lustre/fid/fid_store.c +++ b/lustre/fid/fid_store.c @@ -137,7 +137,7 @@ int seq_store_update(const struct lu_env *env, struct lu_server_seq *seq, if (out != NULL) { rc = fld_declare_server_create(env, - seq->lss_site->ms_server_fld, + seq->lss_site->ss_server_fld, out, th); if (rc) GOTO(exit, rc); @@ -156,7 +156,7 @@ int seq_store_update(const struct lu_env *env, struct lu_server_seq *seq, seq->lss_name, rc); GOTO(exit, rc); } else if (out != NULL) { - rc = fld_server_create(env, seq->lss_site->ms_server_fld, out, + rc = fld_server_create(env, seq->lss_site->ss_server_fld, out, th); if (rc) { CERROR("%s: Can't Update fld database, rc %d\n", diff --git a/lustre/fld/fld_handler.c b/lustre/fld/fld_handler.c index e441959..5e3d068 100644 --- a/lustre/fld/fld_handler.c +++ b/lustre/fld/fld_handler.c @@ -243,9 +243,9 @@ static int fld_req_handle(struct ptlrpc_request *req, !exp->exp_libclient) out->lsr_flags = LU_SEQ_RANGE_MDT; - rc = fld_server_handle(lu_site2md(site)->ms_server_fld, - req->rq_svc_thread->t_env, - *opc, out, info); + rc = fld_server_handle(lu_site2seq(site)->ss_server_fld, + req->rq_svc_thread->t_env, + *opc, out, info); } else rc = err_serious(-EPROTO); @@ -305,26 +305,26 @@ EXPORT_SYMBOL(fld_query); int fid_is_local(const struct lu_env *env, struct lu_site *site, const struct lu_fid *fid) { - int result; - struct md_site *msite; - struct lu_seq_range *range; - struct fld_thread_info *info; - ENTRY; + int result; + struct seq_server_site *ss_site; + struct lu_seq_range *range; + struct fld_thread_info *info; + ENTRY; - info = lu_context_key_get(&env->le_ctx, &fld_thread_key); - range = &info->fti_lrange; + info = lu_context_key_get(&env->le_ctx, &fld_thread_key); + range = &info->fti_lrange; - result = 1; /* conservatively assume fid is local */ - msite = lu_site2md(site); - if (msite->ms_client_fld != NULL) { - int rc; + result = 1; /* conservatively assume fid is local */ + ss_site = lu_site2seq(site); + if (ss_site->ss_client_fld != NULL) { + int rc; - rc = fld_cache_lookup(msite->ms_client_fld->lcf_cache, - fid_seq(fid), range); - if (rc == 0) - result = (range->lsr_index == msite->ms_node_id); - } - return result; + rc = fld_cache_lookup(ss_site->ss_client_fld->lcf_cache, + fid_seq(fid), range); + if (rc == 0) + result = (range->lsr_index == ss_site->ss_node_id); + } + return result; } EXPORT_SYMBOL(fid_is_local); diff --git a/lustre/include/lu_object.h b/lustre/include/lu_object.h index 7f65530..2405771 100644 --- a/lustre/include/lu_object.h +++ b/lustre/include/lu_object.h @@ -651,7 +651,7 @@ struct lu_site { /** * XXX: a hack! fld has to find md_site via site, remove when possible */ - struct md_site *ld_md_site; + struct seq_server_site *ld_seq_site; }; static inline struct lu_site_bkt_data * diff --git a/lustre/include/lustre_fid.h b/lustre/include/lustre_fid.h index 23af14f..0275400 100644 --- a/lustre/include/lustre_fid.h +++ b/lustre/include/lustre_fid.h @@ -379,21 +379,22 @@ struct lu_server_seq { /* sync is needed for update operation */ __u32 lss_need_sync; - /** - * Pointer to site object, required to access site fld. - */ - struct md_site *lss_site; + + /** + * Pointer to site object, required to access site fld. + */ + struct seq_server_site *lss_site; }; int seq_query(struct com_thread_info *info); /* Server methods */ int seq_server_init(struct lu_server_seq *seq, - struct dt_device *dev, - const char *prefix, - enum lu_mgr_type type, - struct md_site *ls, - const struct lu_env *env); + struct dt_device *dev, + const char *prefix, + enum lu_mgr_type type, + struct seq_server_site *ss, + const struct lu_env *env); void seq_server_fini(struct lu_server_seq *seq, const struct lu_env *env); diff --git a/lustre/include/md_object.h b/lustre/include/md_object.h index 8415369..b9ea4ce 100644 --- a/lustre/include/md_object.h +++ b/lustre/include/md_object.h @@ -439,35 +439,35 @@ struct md_object { }; /** - * md-server site. + * seq-server site. */ -struct md_site { - struct lu_site *ms_lu; - /** - * mds number of this site. - */ - mdsno_t ms_node_id; - /** - * Fid location database - */ - struct lu_server_fld *ms_server_fld; - struct lu_client_fld *ms_client_fld; - - /** - * Server Seq Manager - */ - struct lu_server_seq *ms_server_seq; - - /** - * Controller Seq Manager - */ - struct lu_server_seq *ms_control_seq; - struct obd_export *ms_control_exp; - - /** - * Client Seq Manager - */ - struct lu_client_seq *ms_client_seq; +struct seq_server_site { + struct lu_site *ss_lu; + /** + * mds number of this site. + */ + mdsno_t ss_node_id; + /** + * Fid location database + */ + struct lu_server_fld *ss_server_fld; + struct lu_client_fld *ss_client_fld; + + /** + * Server Seq Manager + */ + struct lu_server_seq *ss_server_seq; + + /** + * Controller Seq Manager + */ + struct lu_server_seq *ss_control_seq; + struct obd_export *ss_control_exp; + + /** + * Client Seq Manager + */ + struct lu_client_seq *ss_client_seq; }; static inline int lu_device_is_md(const struct lu_device *d) @@ -503,9 +503,9 @@ static inline struct md_device *md_obj2dev(const struct md_object *o) return container_of0(o->mo_lu.lo_dev, struct md_device, md_lu_dev); } -static inline struct md_site *lu_site2md(const struct lu_site *s) +static inline struct seq_server_site *lu_site2seq(const struct lu_site *s) { - return s->ld_md_site; + return s->ld_seq_site; } static inline int md_device_init(struct md_device *md, struct lu_device_type *t) diff --git a/lustre/mdt/mdt_capa.c b/lustre/mdt/mdt_capa.c index b86b865..76e2c6f 100644 --- a/lustre/mdt/mdt_capa.c +++ b/lustre/mdt/mdt_capa.c @@ -154,7 +154,7 @@ int mdt_capa_keys_init(const struct lu_env *env, struct mdt_device *mdt) int rc; ENTRY; - mdsnum = mdt_md_site(mdt)->ms_node_id; + mdsnum = mdt_seq_site(mdt)->ss_node_id; mti = lu_context_key_get(&env->le_ctx, &mdt_thread_key); LASSERT(mti != NULL); @@ -235,8 +235,8 @@ static int mdt_ck_thread_main(void *args) info = lu_context_key_get(&env.le_ctx, &mdt_thread_key); LASSERT(info != NULL); - tmp = &info->mti_capa_key; - mdsnum = mdt_md_site(mdt)->ms_node_id; + tmp = &info->mti_capa_key; + mdsnum = mdt_seq_site(mdt)->ss_node_id; while (1) { l_wait_event(thread->t_ctl_waitq, thread_is_stopping(thread) || diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c index 61559be..53cb6ae 100644 --- a/lustre/mdt/mdt_handler.c +++ b/lustre/mdt/mdt_handler.c @@ -3753,119 +3753,120 @@ static int mdt_intent_policy(struct ldlm_namespace *ns, static int mdt_seq_fini(const struct lu_env *env, struct mdt_device *m) { - struct md_site *ms = mdt_md_site(m); - ENTRY; + struct seq_server_site *ss = mdt_seq_site(m); + ENTRY; - if (ms != NULL) { - if (ms->ms_server_seq) { - seq_server_fini(ms->ms_server_seq, env); - OBD_FREE_PTR(ms->ms_server_seq); - ms->ms_server_seq = NULL; - } + if (ss == NULL) + RETURN(0); - if (ms->ms_control_seq) { - seq_server_fini(ms->ms_control_seq, env); - OBD_FREE_PTR(ms->ms_control_seq); - ms->ms_control_seq = NULL; - } + if (ss->ss_server_seq) { + seq_server_fini(ss->ss_server_seq, env); + OBD_FREE_PTR(ss->ss_server_seq); + ss->ss_server_seq = NULL; + } - if (ms->ms_client_seq) { - seq_client_fini(ms->ms_client_seq); - OBD_FREE_PTR(ms->ms_client_seq); - ms->ms_client_seq = NULL; - } - } + if (ss->ss_control_seq) { + seq_server_fini(ss->ss_control_seq, env); + OBD_FREE_PTR(ss->ss_control_seq); + ss->ss_control_seq = NULL; + } - RETURN(0); + if (ss->ss_client_seq) { + seq_client_fini(ss->ss_client_seq); + OBD_FREE_PTR(ss->ss_client_seq); + ss->ss_client_seq = NULL; + } + + RETURN(0); } static int mdt_seq_init(const struct lu_env *env, const char *uuid, struct mdt_device *m) { - struct md_site *ms; - char *prefix; - int rc; - ENTRY; + struct seq_server_site *ss; + char *prefix; + int rc; + ENTRY; - ms = mdt_md_site(m); + ss = mdt_seq_site(m); - /* - * This is sequence-controller node. Init seq-controller server on local - * MDT. - */ - if (ms->ms_node_id == 0) { - LASSERT(ms->ms_control_seq == NULL); + /* + * This is sequence-controller node. Init seq-controller server on local + * MDT. + */ + if (ss->ss_node_id == 0) { + LASSERT(ss->ss_control_seq == NULL); - OBD_ALLOC_PTR(ms->ms_control_seq); - if (ms->ms_control_seq == NULL) - RETURN(-ENOMEM); + OBD_ALLOC_PTR(ss->ss_control_seq); + if (ss->ss_control_seq == NULL) + RETURN(-ENOMEM); - rc = seq_server_init(ms->ms_control_seq, - m->mdt_bottom, uuid, - LUSTRE_SEQ_CONTROLLER, - ms, - env); + rc = seq_server_init(ss->ss_control_seq, + m->mdt_bottom, uuid, + LUSTRE_SEQ_CONTROLLER, + ss, + env); - if (rc) - GOTO(out_seq_fini, rc); + if (rc) + GOTO(out_seq_fini, rc); - OBD_ALLOC_PTR(ms->ms_client_seq); - if (ms->ms_client_seq == NULL) - GOTO(out_seq_fini, rc = -ENOMEM); + OBD_ALLOC_PTR(ss->ss_client_seq); + if (ss->ss_client_seq == NULL) + GOTO(out_seq_fini, rc = -ENOMEM); - OBD_ALLOC(prefix, MAX_OBD_NAME + 5); - if (prefix == NULL) { - OBD_FREE_PTR(ms->ms_client_seq); - GOTO(out_seq_fini, rc = -ENOMEM); - } + OBD_ALLOC(prefix, MAX_OBD_NAME + 5); + if (prefix == NULL) { + OBD_FREE_PTR(ss->ss_client_seq); + GOTO(out_seq_fini, rc = -ENOMEM); + } - snprintf(prefix, MAX_OBD_NAME + 5, "ctl-%s", - uuid); + snprintf(prefix, MAX_OBD_NAME + 5, "ctl-%s", + uuid); - /* - * Init seq-controller client after seq-controller server is - * ready. Pass ms->ms_control_seq to it for direct talking. - */ - rc = seq_client_init(ms->ms_client_seq, NULL, - LUSTRE_SEQ_METADATA, prefix, - ms->ms_control_seq); - OBD_FREE(prefix, MAX_OBD_NAME + 5); + /* + * Init seq-controller client after seq-controller server is + * ready. Pass ss->ss_control_seq to it for direct talking. + */ + rc = seq_client_init(ss->ss_client_seq, NULL, + LUSTRE_SEQ_METADATA, prefix, + ss->ss_control_seq); + OBD_FREE(prefix, MAX_OBD_NAME + 5); - if (rc) - GOTO(out_seq_fini, rc); - } + if (rc) + GOTO(out_seq_fini, rc); + } - /* Init seq-server on local MDT */ - LASSERT(ms->ms_server_seq == NULL); + /* Init seq-server on local MDT */ + LASSERT(ss->ss_server_seq == NULL); - OBD_ALLOC_PTR(ms->ms_server_seq); - if (ms->ms_server_seq == NULL) - GOTO(out_seq_fini, rc = -ENOMEM); + OBD_ALLOC_PTR(ss->ss_server_seq); + if (ss->ss_server_seq == NULL) + GOTO(out_seq_fini, rc = -ENOMEM); - rc = seq_server_init(ms->ms_server_seq, - m->mdt_bottom, uuid, - LUSTRE_SEQ_SERVER, - ms, - env); - if (rc) - GOTO(out_seq_fini, rc = -ENOMEM); + rc = seq_server_init(ss->ss_server_seq, + m->mdt_bottom, uuid, + LUSTRE_SEQ_SERVER, + ss, + env); + if (rc) + GOTO(out_seq_fini, rc = -ENOMEM); - /* Assign seq-controller client to local seq-server. */ - if (ms->ms_node_id == 0) { - LASSERT(ms->ms_client_seq != NULL); + /* Assign seq-controller client to local seq-server. */ + if (ss->ss_node_id == 0) { + LASSERT(ss->ss_client_seq != NULL); - rc = seq_server_set_cli(ms->ms_server_seq, - ms->ms_client_seq, - env); - } + rc = seq_server_set_cli(ss->ss_server_seq, + ss->ss_client_seq, + env); + } - EXIT; + EXIT; out_seq_fini: - if (rc) - mdt_seq_fini(env, m); + if (rc) + mdt_seq_fini(env, m); - return rc; + return rc; } /* * Init client sequence manager which is used by local MDS to talk to sequence @@ -3875,7 +3876,7 @@ static int mdt_seq_init_cli(const struct lu_env *env, struct mdt_device *m, struct lustre_cfg *cfg) { - struct md_site *ms = mdt_md_site(m); + struct seq_server_site *ss = mdt_seq_site(m); struct obd_device *mdc; struct obd_uuid *uuidp, *mdcuuidp; char *uuid_str, *mdc_uuid_str; @@ -3897,10 +3898,10 @@ static int mdt_seq_init_cli(const struct lu_env *env, RETURN(-EINVAL); } - /* check if this is adding the first MDC and controller is not yet - * initialized. */ - if (index != 0 || ms->ms_client_seq) - RETURN(0); + /* check if this is adding the first MDC and controller is not yet + * initialized. */ + if (index != 0 || ss->ss_client_seq) + RETURN(0); uuid_str = lustre_cfg_string(cfg, 1); mdc_uuid_str = lustre_cfg_string(cfg, 4); @@ -3916,32 +3917,32 @@ static int mdt_seq_init_cli(const struct lu_env *env, CERROR("target %s not set up\n", mdc->obd_name); rc = -EINVAL; } else { - LASSERT(ms->ms_control_exp); - OBD_ALLOC_PTR(ms->ms_client_seq); - if (ms->ms_client_seq != NULL) { - char *prefix; - - OBD_ALLOC(prefix, MAX_OBD_NAME + 5); - if (!prefix) - RETURN(-ENOMEM); - - snprintf(prefix, MAX_OBD_NAME + 5, "ctl-%s", - mdc->obd_name); - - rc = seq_client_init(ms->ms_client_seq, - ms->ms_control_exp, - LUSTRE_SEQ_METADATA, - prefix, NULL); - OBD_FREE(prefix, MAX_OBD_NAME + 5); - } else - rc = -ENOMEM; + LASSERT(ss->ss_control_exp); + OBD_ALLOC_PTR(ss->ss_client_seq); + if (ss->ss_client_seq != NULL) { + char *prefix; + + OBD_ALLOC(prefix, MAX_OBD_NAME + 5); + if (!prefix) + RETURN(-ENOMEM); + + snprintf(prefix, MAX_OBD_NAME + 5, "ctl-%s", + mdc->obd_name); + + rc = seq_client_init(ss->ss_client_seq, + ss->ss_control_exp, + LUSTRE_SEQ_METADATA, + prefix, NULL); + OBD_FREE(prefix, MAX_OBD_NAME + 5); + } else + rc = -ENOMEM; - if (rc) - RETURN(rc); + if (rc) + RETURN(rc); - LASSERT(ms->ms_server_seq != NULL); - rc = seq_server_set_cli(ms->ms_server_seq, ms->ms_client_seq, - env); + LASSERT(ss->ss_server_seq != NULL); + rc = seq_server_set_cli(ss->ss_server_seq, ss->ss_client_seq, + env); } RETURN(rc); @@ -3949,23 +3950,24 @@ static int mdt_seq_init_cli(const struct lu_env *env, static void mdt_seq_fini_cli(struct mdt_device *m) { - struct md_site *ms; + struct seq_server_site *ss; - ENTRY; + ENTRY; - ms = mdt_md_site(m); + ss = mdt_seq_site(m); - if (ms != NULL) { - if (ms->ms_server_seq) - seq_server_set_cli(ms->ms_server_seq, - NULL, NULL); + if (ss == NULL) + RETURN_EXIT; - if (ms->ms_control_exp) { - class_export_put(ms->ms_control_exp); - ms->ms_control_exp = NULL; - } - } - EXIT; + if (ss->ss_server_seq) + seq_server_set_cli(ss->ss_server_seq, NULL, NULL); + + if (ss->ss_control_exp) { + class_export_put(ss->ss_control_exp); + ss->ss_control_exp = NULL; + } + + EXIT; } /* @@ -3974,41 +3976,41 @@ static void mdt_seq_fini_cli(struct mdt_device *m) static int mdt_fld_fini(const struct lu_env *env, struct mdt_device *m) { - struct md_site *ms = mdt_md_site(m); - ENTRY; + struct seq_server_site *ss = mdt_seq_site(m); + ENTRY; - if (ms && ms->ms_server_fld) { - fld_server_fini(env, ms->ms_server_fld); - OBD_FREE_PTR(ms->ms_server_fld); - ms->ms_server_fld = NULL; - } + if (ss && ss->ss_server_fld) { + fld_server_fini(env, ss->ss_server_fld); + OBD_FREE_PTR(ss->ss_server_fld); + ss->ss_server_fld = NULL; + } - RETURN(0); + RETURN(0); } static int mdt_fld_init(const struct lu_env *env, const char *uuid, struct mdt_device *m) { - struct md_site *ms; - int rc; - ENTRY; + struct seq_server_site *ss; + int rc; + ENTRY; - ms = mdt_md_site(m); + ss = mdt_seq_site(m); - OBD_ALLOC_PTR(ms->ms_server_fld); - if (ms->ms_server_fld == NULL) - RETURN(rc = -ENOMEM); + OBD_ALLOC_PTR(ss->ss_server_fld); + if (ss->ss_server_fld == NULL) + RETURN(rc = -ENOMEM); - rc = fld_server_init(env, ms->ms_server_fld, m->mdt_bottom, uuid, - ms->ms_node_id); - if (rc) { - OBD_FREE_PTR(ms->ms_server_fld); - ms->ms_server_fld = NULL; - RETURN(rc); - } + rc = fld_server_init(env, ss->ss_server_fld, m->mdt_bottom, uuid, + ss->ss_node_id); + if (rc) { + OBD_FREE_PTR(ss->ss_server_fld); + ss->ss_server_fld = NULL; + RETURN(rc); + } - RETURN(0); + RETURN(0); } static void mdt_stack_fini(const struct lu_env *env, @@ -4254,7 +4256,7 @@ static int mdt_quota_init(const struct lu_env *env, struct mdt_device *mdt, LASSERT(mdt->mdt_qmt_dev == NULL); /* quota master is on MDT0 only for now */ - if (mdt->mdt_mite.ms_node_id != 0) + if (mdt->mdt_seq_site.ss_node_id != 0) RETURN(0); /* MGS generates config commands which look as follows: @@ -4478,7 +4480,7 @@ static int mdt_init0(const struct lu_env *env, struct mdt_device *m, struct lustre_mount_info *lmi = NULL; struct lustre_sb_info *lsi; struct lu_site *s; - struct md_site *mite; + struct seq_server_site *ss_site; const char *identity_upcall = "NONE"; struct md_device *next; int rc; @@ -4554,17 +4556,17 @@ static int mdt_init0(const struct lu_env *env, struct mdt_device *m, } s = m->mdt_md_dev.md_lu_dev.ld_site; - mite = &m->mdt_mite; - s->ld_md_site = mite; - mite->ms_lu = s; + ss_site = &m->mdt_seq_site; + s->ld_seq_site = ss_site; + ss_site->ss_lu = s; /* set server index */ - mite->ms_node_id = node_id; + ss_site->ss_node_id = node_id; - /* failover is the default - * FIXME: we do not failout mds0/mgs, which may cause some problems. - * assumed whose ms_node_id == 0 XXX - * */ + /* failover is the default + * FIXME: we do not failout mds0/mgs, which may cause some problems. + * assumed whose ss_node_id == 0 XXX + * */ obd->obd_replayable = 1; /* No connection accepted until configurations will finish */ obd->obd_no_conn = 1; diff --git a/lustre/mdt/mdt_internal.h b/lustre/mdt/mdt_internal.h index 7220d2b..262ac79 100644 --- a/lustre/mdt/mdt_internal.h +++ b/lustre/mdt/mdt_internal.h @@ -99,7 +99,7 @@ struct mdt_file_data { struct mdt_device { /* super-class */ struct md_device mdt_md_dev; - struct md_site mdt_mite; + struct seq_server_site mdt_seq_site; struct ptlrpc_service *mdt_regular_service; struct ptlrpc_service *mdt_readpage_service; struct ptlrpc_service *mdt_xmds_service; @@ -536,9 +536,9 @@ static inline struct lu_site *mdt_lu_site(const struct mdt_device *mdt) return mdt->mdt_md_dev.md_lu_dev.ld_site; } -static inline struct md_site *mdt_md_site(struct mdt_device *mdt) +static inline struct seq_server_site *mdt_seq_site(struct mdt_device *mdt) { - return &mdt->mdt_mite; + return &mdt->mdt_seq_site; } static inline void mdt_export_evict(struct obd_export *exp) diff --git a/lustre/mdt/mdt_reint.c b/lustre/mdt/mdt_reint.c index d18d10c..191801d 100644 --- a/lustre/mdt/mdt_reint.c +++ b/lustre/mdt/mdt_reint.c @@ -881,17 +881,17 @@ static int mdt_rename_lock(struct mdt_thread_info *info, ldlm_policy_data_t *policy = &info->mti_policy; struct ldlm_res_id *res_id = &info->mti_res_id; __u64 flags = 0; - struct md_site *ms; + struct seq_server_site *ss; int rc; ENTRY; - ms = mdt_md_site(info->mti_mdt); - fid_build_reg_res_name(&LUSTRE_BFL_FID, res_id); + ss = mdt_seq_site(info->mti_mdt); + fid_build_reg_res_name(&LUSTRE_BFL_FID, res_id); memset(policy, 0, sizeof *policy); policy->l_inodebits.bits = MDS_INODELOCK_UPDATE; - if (ms->ms_control_exp == NULL) { + if (ss->ss_control_exp == NULL) { flags = LDLM_FL_LOCAL_ONLY | LDLM_FL_ATOMIC_CB; /* @@ -907,11 +907,12 @@ static int mdt_rename_lock(struct mdt_thread_info *info, } else { struct ldlm_enqueue_info einfo = { LDLM_IBITS, LCK_EX, ldlm_blocking_ast, ldlm_completion_ast, NULL, NULL, NULL }; - /* - * This is the case mdt0 is remote node, issue DLM lock like - * other clients. - */ - rc = ldlm_cli_enqueue(ms->ms_control_exp, NULL, &einfo, res_id, + + /* + * This is the case mdt0 is remote node, issue DLM lock like + * other clients. + */ + rc = ldlm_cli_enqueue(ss->ss_control_exp, NULL, &einfo, res_id, policy, &flags, NULL, 0, LVB_T_NONE, lh, 0); } diff --git a/lustre/obdecho/echo_client.c b/lustre/obdecho/echo_client.c index 4d1de89..f1b4f9e 100644 --- a/lustre/obdecho/echo_client.c +++ b/lustre/obdecho/echo_client.c @@ -754,7 +754,7 @@ LU_TYPE_INIT_FINI(echo, &echo_thread_key, &echo_session_key); #define ECHO_SEQ_WIDTH 0xffffffff static int echo_fid_init(struct echo_device *ed, char *obd_name, - struct md_site *ms) + struct seq_server_site *ss) { char *prefix; int rc; @@ -770,10 +770,10 @@ static int echo_fid_init(struct echo_device *ed, char *obd_name, snprintf(prefix, MAX_OBD_NAME + 5, "srv-%s", obd_name); - /* Init client side sequence-manager */ - rc = seq_client_init(ed->ed_cl_seq, NULL, - LUSTRE_SEQ_METADATA, - prefix, ms->ms_server_seq); + /* Init client side sequence-manager */ + rc = seq_client_init(ed->ed_cl_seq, NULL, + LUSTRE_SEQ_METADATA, + prefix, ss->ss_server_seq); ed->ed_cl_seq->lcs_width = ECHO_SEQ_WIDTH; OBD_FREE(prefix, MAX_OBD_NAME + 5); if (rc) @@ -900,11 +900,11 @@ static struct lu_device *echo_device_alloc(const struct lu_env *env, ed->ed_site_myself.cs_lu = *ls; ed->ed_site = &ed->ed_site_myself; ed->ed_cl.cd_lu_dev.ld_site = &ed->ed_site_myself.cs_lu; - rc = echo_fid_init(ed, obd->obd_name, lu_site2md(ls)); - if (rc) { - CERROR("echo fid init error %d\n", rc); - GOTO(out, rc); - } + rc = echo_fid_init(ed, obd->obd_name, lu_site2seq(ls)); + if (rc) { + CERROR("echo fid init error %d\n", rc); + GOTO(out, rc); + } } else { /* if echo client is to be stacked upon ost device, the next is * NULL since ost is not a clio device so far */ diff --git a/lustre/osd-ldiskfs/osd_internal.h b/lustre/osd-ldiskfs/osd_internal.h index bd3f9e3..c839eb9 100644 --- a/lustre/osd-ldiskfs/osd_internal.h +++ b/lustre/osd-ldiskfs/osd_internal.h @@ -826,9 +826,9 @@ static inline journal_t *osd_journal(const struct osd_device *dev) return LDISKFS_SB(osd_sb(dev))->s_journal; } -static inline struct md_site *osd_md_site(struct osd_device *osd) +static inline struct seq_server_site *osd_seq_site(struct osd_device *osd) { - return osd->od_dt_dev.dd_lu_dev.ld_site->ld_md_site; + return osd->od_dt_dev.dd_lu_dev.ld_site->ld_seq_site; } static inline char *osd_name(struct osd_device *osd)