From b1ed8e57da67feddb9c5e67abaf6db1b70333fa0 Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Tue, 18 May 2021 11:56:32 -0600 Subject: [PATCH] LU-14430 mdd: rename mti_fid to mdi_fid and friends Rename mdd_thread_info fields to avoid confusion with mdt_thread_info. The final patch to rename mdd_thread_info fields to a unique prefix: mti_cattr->mdi_cattr mti_fid->mdi_fid mti_fid2->mdi_fid2 MTI_KEEP_KEY->MDI_KEEP_KEY mti_la_for_fix->mdi_la_for_fix mti_la_for_start->mdi_la_for_start mti_pattr->mdi_pattr mti_tattr->mdi_tattr mti_tpattr->mdi_tpattr Test-Parameters: trivial Signed-off-by: Andreas Dilger Change-Id: I17bcc3ddfae400a5ca76e4f654c696da6d3ebbe5 Reviewed-on: https://review.whamcloud.com/43740 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Neil Brown Reviewed-by: Mike Pershin Reviewed-by: Arshad Hussain Reviewed-by: Oleg Drokin --- contrib/scripts/spelling.txt | 10 ++++++++ lustre/mdd/mdd_dir.c | 58 ++++++++++++++++++++++---------------------- lustre/mdd/mdd_internal.h | 22 ++++++++--------- lustre/mdd/mdd_object.c | 2 +- lustre/mdd/mdd_orphans.c | 6 ++--- 5 files changed, 54 insertions(+), 44 deletions(-) diff --git a/contrib/scripts/spelling.txt b/contrib/scripts/spelling.txt index 761e5e7..baa8142 100644 --- a/contrib/scripts/spelling.txt +++ b/contrib/scripts/spelling.txt @@ -157,19 +157,29 @@ l_wait_condition||wait_event_idle \bMIN\(||min_t mdo2fid||mdd_object_fid mktemp||mkstemp +mti_cattr||mdi_cattr mti_chlg_buf||mdi_chlg_buf mti_dof||mdi_dof mti_dt_rec||mdi_dt_rec mti_ent||mdi_ent +mti_fid||mdi_fid +mti_fid2||mdi_fid2 mti_flags||mdi_flags mti_hint||mdi_hint +MTI_KEEP_KEY||MDI_KEEP_KEY +mti_key||mdi_key +mti_la_for_fix||mdi_la_for_fix +mti_la_for_start||mdi_la_for_start mti_link_buf||mdi_link_buf mti_link_data||mdi_link_data mti_key||mdi_key mti_name||mdi_name mti_oa||mdi_oa +mti_pattr||mdi_pattr mti_range||mdi_range mti_spec||mdi_spec +mti_tattr||mdi_tattr +mti_tpattr||mdi_tpattr mti_xattr_buf||mdi_xattr_buf OS_STATE_DEGRADED||OS_STATFS_DEGRADED OS_STATE_READONLY||OS_STATFS_READONLY diff --git a/lustre/mdd/mdd_dir.c b/lustre/mdd/mdd_dir.c index 026d626..497366a 100644 --- a/lustre/mdd/mdd_dir.c +++ b/lustre/mdd/mdd_dir.c @@ -278,7 +278,7 @@ static int mdd_is_parent(const struct lu_env *env, int rc; LASSERT(!lu_fid_eq(mdd_object_fid(mo), tfid)); - pfid = &mdd_env_info(env)->mti_fid; + pfid = &mdd_env_info(env)->mdi_fid; if (mdd_is_root(mdd, mdd_object_fid(mo))) return 0; @@ -1093,7 +1093,7 @@ static int __mdd_links_add(const struct lu_env *env, } if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_LINKEA_MORE)) { - struct lu_fid *tfid = &mdd_env_info(env)->mti_fid2; + struct lu_fid *tfid = &mdd_env_info(env)->mdi_fid2; *tfid = *pfid; tfid->f_ver = ~0; @@ -1382,14 +1382,14 @@ static int mdd_link(const struct lu_env *env, struct md_object *tgt_obj, struct md_attr *ma) { const char *name = lname->ln_name; - struct lu_attr *la = &mdd_env_info(env)->mti_la_for_fix; + struct lu_attr *la = &mdd_env_info(env)->mdi_la_for_fix; struct mdd_object *mdd_tobj = md2mdd_obj(tgt_obj); struct mdd_object *mdd_sobj = md2mdd_obj(src_obj); struct lu_attr *cattr = MDD_ENV_VAR(env, cattr); struct lu_attr *tattr = MDD_ENV_VAR(env, tattr); struct mdd_device *mdd = mdo2mdd(src_obj); struct thandle *handle; - struct lu_fid *tfid = &mdd_env_info(env)->mti_fid2; + struct lu_fid *tfid = &mdd_env_info(env)->mdi_fid2; struct linkea_data *ldata = &mdd_env_info(env)->mdi_link_data; int rc; ENTRY; @@ -1600,7 +1600,7 @@ static int mdd_declare_unlink(const struct lu_env *env, struct mdd_device *mdd, const struct lu_name *name, struct md_attr *ma, struct thandle *handle, int no_name, int is_dir) { - struct lu_attr *la = &mdd_env_info(env)->mti_la_for_fix; + struct lu_attr *la = &mdd_env_info(env)->mdi_la_for_fix; int rc; if (!OBD_FAIL_CHECK(OBD_FAIL_LFSCK_DANGLING2)) { @@ -1699,7 +1699,7 @@ static int mdd_unlink(const struct lu_env *env, struct md_object *pobj, const char *name = lname->ln_name; struct lu_attr *pattr = MDD_ENV_VAR(env, pattr); struct lu_attr *cattr = MDD_ENV_VAR(env, cattr); - struct lu_attr *la = &mdd_env_info(env)->mti_la_for_fix; + struct lu_attr *la = &mdd_env_info(env)->mdi_la_for_fix; struct mdd_object *mdd_pobj = md2mdd_obj(pobj); struct mdd_object *mdd_cobj = NULL; struct mdd_device *mdd = mdo2mdd(pobj); @@ -2018,17 +2018,17 @@ static int mdd_object_initialize(const struct lu_env *env, * under the directory */ static int mdd_create_sanity_check(const struct lu_env *env, - struct md_object *pobj, + struct md_object *pobj, const struct lu_attr *pattr, - const struct lu_name *lname, + const struct lu_name *lname, struct lu_attr *cattr, - struct md_op_spec *spec) + struct md_op_spec *spec) { struct mdd_thread_info *info = mdd_env_info(env); - struct lu_fid *fid = &info->mti_fid; - struct mdd_object *obj = md2mdd_obj(pobj); - struct mdd_device *m = mdo2mdd(pobj); - bool check_perm = true; + struct lu_fid *fid = &info->mdi_fid; + struct mdd_object *obj = md2mdd_obj(pobj); + struct mdd_device *m = mdo2mdd(pobj); + bool check_perm = true; int rc; ENTRY; @@ -2272,7 +2272,7 @@ static int mdd_declare_create(const struct lu_env *env, struct mdd_device *mdd, if (rc) GOTO(out, rc); } else { - struct lu_attr *la = &mdd_env_info(env)->mti_la_for_fix; + struct lu_attr *la = &mdd_env_info(env)->mdi_la_for_fix; enum changelog_rec_type type; rc = mdo_declare_index_insert(env, p, mdd_object_fid(c), @@ -2583,13 +2583,13 @@ int mdd_create(const struct lu_env *env, struct md_object *pobj, struct md_op_spec *spec, struct md_attr *ma) { struct mdd_thread_info *info = mdd_env_info(env); - struct lu_attr *la = &info->mti_la_for_fix; + struct lu_attr *la = &info->mdi_la_for_fix; struct mdd_object *mdd_pobj = md2mdd_obj(pobj); struct mdd_object *son = md2mdd_obj(child); struct mdd_device *mdd = mdo2mdd(pobj); struct lu_attr *attr = &ma->ma_attr; struct thandle *handle; - struct lu_attr *pattr = &info->mti_pattr; + struct lu_attr *pattr = &info->mdi_pattr; struct lu_buf acl_buf; struct lu_buf def_acl_buf; struct lu_buf hsm_buf; @@ -2857,7 +2857,7 @@ static int mdd_declare_rename(const struct lu_env *env, struct linkea_data *ldata, struct thandle *handle) { - struct lu_attr *la = &mdd_env_info(env)->mti_la_for_fix; + struct lu_attr *la = &mdd_env_info(env)->mdi_la_for_fix; int rc; LASSERT(ma->ma_attr.la_valid & LA_CTIME); @@ -2984,7 +2984,7 @@ static int mdd_rename(const struct lu_env *env, { const char *sname = lsname->ln_name; const char *tname = ltname->ln_name; - struct lu_attr *la = &mdd_env_info(env)->mti_la_for_fix; + struct lu_attr *la = &mdd_env_info(env)->mdi_la_for_fix; struct mdd_object *mdd_spobj = md2mdd_obj(src_pobj); /* source parent */ struct mdd_object *mdd_tpobj = md2mdd_obj(tgt_pobj); struct mdd_device *mdd = mdo2mdd(src_pobj); @@ -3722,7 +3722,7 @@ static int mdd_declare_migrate_update(const struct lu_env *env, struct thandle *handle) { struct mdd_thread_info *info = mdd_env_info(env); - struct lu_attr *la = &info->mti_la_for_fix; + struct lu_attr *la = &info->mdi_la_for_fix; int rc; rc = mdo_declare_index_delete(env, spobj, sname->ln_name, handle); @@ -3914,7 +3914,7 @@ static int mdd_migrate_update(const struct lu_env *env, struct thandle *handle) { struct mdd_thread_info *info = mdd_env_info(env); - struct lu_attr *la = &info->mti_la_for_fix; + struct lu_attr *la = &info->mdi_la_for_fix; int rc; ENTRY; @@ -4159,9 +4159,9 @@ static int mdd_migrate_object(const struct lu_env *env, { struct mdd_thread_info *info = mdd_env_info(env); struct mdd_device *mdd = mdo2mdd(&spobj->mod_obj); - struct lu_attr *spattr = &info->mti_pattr; - struct lu_attr *tpattr = &info->mti_tpattr; - struct lu_attr *attr = &info->mti_cattr; + struct lu_attr *spattr = &info->mdi_pattr; + struct lu_attr *tpattr = &info->mdi_tpattr; + struct lu_attr *attr = &info->mdi_cattr; struct linkea_data *ldata = &info->mdi_link_data; struct dt_allocation_hint *hint = &info->mdi_hint; struct lu_buf sbuf = { NULL }; @@ -4326,7 +4326,7 @@ static int mdd_migrate(const struct lu_env *env, struct md_object *md_pobj, struct mdd_object *spobj = NULL; struct mdd_object *tpobj = NULL; struct lu_buf pbuf = { NULL }; - struct lu_fid *fid = &info->mti_fid2; + struct lu_fid *fid = &info->mdi_fid2; struct lmv_mds_md_v1 *lmv; int rc; @@ -4555,8 +4555,8 @@ int mdd_dir_layout_shrink(const struct lu_env *env, struct mdd_object *obj = md2mdd_obj(md_obj); struct mdd_object *pobj = NULL; struct mdd_object *stripe = NULL; - struct lu_attr *attr = &info->mti_pattr; - struct lu_fid *fid = &info->mti_fid2; + struct lu_attr *attr = &info->mdi_pattr; + struct lu_fid *fid = &info->mdi_fid2; struct lu_name lname = { NULL }; struct lu_buf lmv_buf = { NULL }; struct lmv_mds_md_v1 *lmv; @@ -4701,7 +4701,7 @@ static int mdd_dir_declare_split_plain(const struct lu_env *env, { struct mdd_thread_info *info = mdd_env_info(env); const struct lu_name *lname = mlc->mlc_name; - struct lu_attr *la = &info->mti_la_for_fix; + struct lu_attr *la = &info->mdi_la_for_fix; struct lmv_user_md_v1 *lum = mlc->mlc_spec->u.sp_ea.eadata; struct linkea_data *ldata = &info->mdi_link_data; struct lmv_mds_md_v1 *lmv; @@ -4799,8 +4799,8 @@ static int mdd_dir_split_plain(const struct lu_env *env, struct thandle *handle) { struct mdd_thread_info *info = mdd_env_info(env); - struct lu_attr *pattr = &info->mti_pattr; - struct lu_attr *la = &info->mti_la_for_fix; + struct lu_attr *pattr = &info->mdi_pattr; + struct lu_attr *la = &info->mdi_la_for_fix; const struct lu_name *lname = mlc->mlc_name; struct linkea_data *ldata = &info->mdi_link_data; int rc; diff --git a/lustre/mdd/mdd_internal.h b/lustre/mdd/mdd_internal.h index 6b070c0..3ed6472 100644 --- a/lustre/mdd/mdd_internal.h +++ b/lustre/mdd/mdd_internal.h @@ -177,22 +177,22 @@ struct mdd_object { struct list_head mod_users; /**< unique user opens */ }; -#define MTI_KEEP_KEY 0x01 +#define MDI_KEEP_KEY 0x01 struct mdd_thread_info { - struct lu_fid mti_fid; - struct lu_fid mti_fid2; /* used for be & cpu converting */ + struct lu_fid mdi_fid; + struct lu_fid mdi_fid2; /* used for be & cpu converting */ /** * only be used by MDD interfaces, can be passed into local MDD APIs. */ - struct lu_attr mti_pattr; - struct lu_attr mti_cattr; - struct lu_attr mti_tpattr; - struct lu_attr mti_tattr; - /** used to set c/mtime */ - struct lu_attr mti_la_for_fix; + struct lu_attr mdi_pattr; + struct lu_attr mdi_cattr; + struct lu_attr mdi_tpattr; + struct lu_attr mdi_tattr; + /** used to set ctime/mtime */ + struct lu_attr mdi_la_for_fix; /* Only used in mdd_object_start */ - struct lu_attr mti_la_for_start; + struct lu_attr mdi_la_for_start; /* mdi_ent/mdi_key must be together so mdi_ent::lde_name is mdi_key */ struct lu_dirent mdi_ent; char mdi_key[NAME_MAX + 16]; @@ -295,7 +295,7 @@ int mdd_changelog_write_rec(const struct lu_env *env, struct mdd_thread_info *mdd_env_info(const struct lu_env *env); -#define MDD_ENV_VAR(env, var) (&mdd_env_info(env)->mti_##var) +#define MDD_ENV_VAR(env, var) (&mdd_env_info(env)->mdi_##var) struct lu_buf *mdd_buf_get(const struct lu_env *env, void *area, ssize_t len); const struct lu_buf *mdd_buf_get_const(const struct lu_env *env, diff --git a/lustre/mdd/mdd_object.c b/lustre/mdd/mdd_object.c index 0328371..77bf9a7 100644 --- a/lustre/mdd/mdd_object.c +++ b/lustre/mdd/mdd_object.c @@ -1213,7 +1213,7 @@ int mdd_attr_set(const struct lu_env *env, struct md_object *obj, struct mdd_object *mdd_obj = md2mdd_obj(obj); struct mdd_device *mdd = mdo2mdd(obj); struct thandle *handle = NULL; - struct lu_attr *la_copy = &mdd_env_info(env)->mti_la_for_fix; + struct lu_attr *la_copy = &mdd_env_info(env)->mdi_la_for_fix; struct lu_attr *attr = MDD_ENV_VAR(env, cattr); const struct lu_attr *la = &ma->ma_attr; struct lu_ucred *uc; diff --git a/lustre/mdd/mdd_orphans.c b/lustre/mdd/mdd_orphans.c index 563e596..1dde5f3 100644 --- a/lustre/mdd/mdd_orphans.c +++ b/lustre/mdd/mdd_orphans.c @@ -60,7 +60,7 @@ static struct dt_key *mdd_orphan_key_fill(const struct lu_env *env, char *key = mdd_env_info(env)->mdi_key; LASSERT(key); - if (!(MTI_KEEP_KEY & mdd_env_info(env)->mdi_flags)) + if (!(MDI_KEEP_KEY & mdd_env_info(env)->mdi_flags)) snprintf(key, sizeof(mdd_env_info(env)->mdi_key), DFID_NOBRACE, PFID(lf)); @@ -74,7 +74,7 @@ static struct dt_key *mdd_orphan_key_fill_20(const struct lu_env *env, char *key = mdd_env_info(env)->mdi_key; LASSERT(key); - if (!(MTI_KEEP_KEY & mdd_env_info(env)->mdi_flags)) + if (!(MDI_KEEP_KEY & mdd_env_info(env)->mdi_flags)) snprintf(key, sizeof(mdd_env_info(env)->mdi_key), ORPHAN_FILE_NAME_FORMAT_20, fid_seq(lf), fid_oid(lf), fid_ver(lf), @@ -428,7 +428,7 @@ static int mdd_orphan_index_iterate(const struct lu_env *env, GOTO(out_put, rc = -EIO); } - mdd_env_info(env)->mdi_flags |= MTI_KEEP_KEY; + mdd_env_info(env)->mdi_flags |= MDI_KEEP_KEY; do { if (thread->mgt_abort) break; -- 1.8.3.1