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

Lustre-change: https://review.whamcloud.com/43740
Lustre-commit: b1ed8e57da67feddb9c5e67abaf6db1b70333fa0

Test-Parameters: trivial
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: I17bcc3ddfae400a5ca76e4f654c696da6d3ebbe5
Reviewed-by: Mike Pershin <mpershin@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/46195
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>

diff --git a/contrib/scripts/spelling.txt b/contrib/scripts/spelling.txt
index eed715c..70a33d0 100644 (file)
--- a/contrib/scripts/spelling.txt
+++ b/contrib/scripts/spelling.txt
@@ -156,19 +156,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 82daa6f..5d66f4e 100644 (file)
--- a/lustre/mdd/mdd_dir.c
+++ b/lustre/mdd/mdd_dir.c
@@ -279,7 +279,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;
@@ -1092,7 +1092,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;
@@ -1370,14 +1370,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;
@@ -1588,7 +1588,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)) {
@@ -1687,7 +1687,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);
@@ -2006,17 +2006,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;
 
@@ -2260,7 +2260,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),
@@ -2571,13 +2571,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;
@@ -2845,7 +2845,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);
@@ -2972,7 +2972,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);
@@ -3710,7 +3710,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);
@@ -3902,7 +3902,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;
@@ -4147,9 +4147,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 };
@@ -4314,7 +4314,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;
 
@@ -4543,8 +4543,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;
@@ -4689,7 +4689,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;
@@ -4787,8 +4787,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 a63dbe7..684c29c 100644 (file)
--- 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 652d304..fc07f4a 100644 (file)
--- a/lustre/mdd/mdd_object.c
+++ b/lustre/mdd/mdd_object.c
@@ -1212,7 +1212,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 1e59d51..66b5164 100644 (file)
--- a/lustre/mdd/mdd_orphans.c
+++ b/lustre/mdd/mdd_orphans.c
@@ -61,7 +61,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));
 
@@ -75,7 +75,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),
@@ -431,7 +431,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;