LU-11025 lmv: simplify name to stripe mapping

[fs/lustre-release.git] / lustre / lmv / lmv_internal.h

diff --git a/lustre/lmv/lmv_internal.h b/lustre/lmv/lmv_internal.h
index 84a6d98..340bd5a 100644 (file)
--- a/lustre/lmv/lmv_internal.h
+++ b/lustre/lmv/lmv_internal.h
@@ -156,41 +156,20 @@ static inline int lmv_stripe_md_size(int stripe_count)
 /* for file under migrating directory, return the target stripe info */
 static inline const struct lmv_oinfo *
 lsm_name_to_stripe_info(const struct lmv_stripe_md *lsm, const char *name,
-                       int namelen, bool post_migrate)
+                       int namelen, bool new_layout)
 {
-       __u32 hash_type = lsm->lsm_md_hash_type;
-       __u32 stripe_count = lsm->lsm_md_stripe_count;
        int stripe_index;
 
        LASSERT(lmv_dir_striped(lsm));
 
-       if (hash_type & LMV_HASH_FLAG_MIGRATION) {
-               if (post_migrate) {
-                       hash_type &= ~LMV_HASH_FLAG_MIGRATION;
-                       stripe_count = lsm->lsm_md_migrate_offset;
-               } else {
-                       hash_type = lsm->lsm_md_migrate_hash;
-                       stripe_count -= lsm->lsm_md_migrate_offset;
-               }
-       }
-
-       stripe_index = lmv_name_to_stripe_index(hash_type, stripe_count,
-                                               name, namelen);
+       stripe_index = __lmv_name_to_stripe_index(lsm->lsm_md_hash_type,
+                                                 lsm->lsm_md_stripe_count,
+                                                 lsm->lsm_md_migrate_hash,
+                                                 lsm->lsm_md_migrate_offset,
+                                                 name, namelen, new_layout);
        if (stripe_index < 0)
                return ERR_PTR(stripe_index);
 
-       if ((lsm->lsm_md_hash_type & LMV_HASH_FLAG_MIGRATION) && !post_migrate)
-               stripe_index += lsm->lsm_md_migrate_offset;
-
-       if (stripe_index >= lsm->lsm_md_stripe_count) {
-               CERROR("stripe_index %d stripe_count %d hash_type %#x "
-                       "migrate_offset %d migrate_hash %#x name %.*s\n",
-                       stripe_index, lsm->lsm_md_stripe_count,
-                       lsm->lsm_md_hash_type, lsm->lsm_md_migrate_offset,
-                       lsm->lsm_md_migrate_hash, namelen, name);
-               return ERR_PTR(-EBADF);
-       }
-
        return &lsm->lsm_md_oinfo[stripe_index];
 }
 
@@ -201,8 +180,8 @@ static inline bool lmv_dir_retry_check_update(struct md_op_data *op_data)
        if (!lsm)
                return false;
 
-       if (lmv_dir_migrating(lsm) && !op_data->op_post_migrate) {
-               op_data->op_post_migrate = true;
+       if (lmv_dir_layout_changing(lsm) && !op_data->op_new_layout) {
+               op_data->op_new_layout = true;
                return true;
        }
 
@@ -217,8 +196,7 @@ static inline bool lmv_dir_retry_check_update(struct md_op_data *op_data)
 
 struct lmv_tgt_desc *lmv_locate_tgt(struct lmv_obd *lmv,
                                    struct md_op_data *op_data);
-int lmv_migrate_existence_check(struct lmv_obd *lmv,
-                               struct md_op_data *op_data);
+int lmv_old_layout_lookup(struct lmv_obd *lmv, struct md_op_data *op_data);
 
 /* lproc_lmv.c */
 int lmv_tunables_init(struct obd_device *obd);