LU-13040 lmv: Pool name string handling

[fs/lustre-release.git] / lustre / include / lustre_lmv.h

diff --git a/lustre/include/lustre_lmv.h b/lustre/include/lustre_lmv.h
index d5fb751..5e03321 100644 (file)
--- a/lustre/include/lustre_lmv.h
+++ b/lustre/include/lustre_lmv.h
@@ -54,6 +54,34 @@ struct lmv_stripe_md {
        struct lmv_oinfo lsm_md_oinfo[0];
 };
 
+static inline bool lmv_dir_striped(const struct lmv_stripe_md *lsm)
+{
+       return lsm && lsm->lsm_md_magic == LMV_MAGIC;
+}
+
+static inline bool lmv_dir_foreign(const struct lmv_stripe_md *lsm)
+{
+       return lsm && lsm->lsm_md_magic == LMV_MAGIC_FOREIGN;
+}
+
+static inline bool lmv_dir_migrating(const struct lmv_stripe_md *lsm)
+{
+       return lmv_dir_striped(lsm) &&
+              lsm->lsm_md_hash_type & LMV_HASH_FLAG_MIGRATION;
+}
+
+static inline bool lmv_dir_bad_hash(const struct lmv_stripe_md *lsm)
+{
+       if (!lmv_dir_striped(lsm))
+               return false;
+
+       if (lmv_dir_migrating(lsm) &&
+           lsm->lsm_md_stripe_count - lsm->lsm_md_migrate_offset <= 1)
+               return false;
+
+       return !lmv_is_known_hash_type(lsm->lsm_md_hash_type);
+}
+
 static inline bool
 lsm_md_eq(const struct lmv_stripe_md *lsm1, const struct lmv_stripe_md *lsm2)
 {
@@ -70,14 +98,16 @@ lsm_md_eq(const struct lmv_stripe_md *lsm1, const struct lmv_stripe_md *lsm2)
                                lsm2->lsm_md_migrate_offset ||
            lsm1->lsm_md_migrate_hash !=
                                lsm2->lsm_md_migrate_hash ||
-           strcmp(lsm1->lsm_md_pool_name,
-                     lsm2->lsm_md_pool_name) != 0)
+           strncmp(lsm1->lsm_md_pool_name, lsm2->lsm_md_pool_name,
+                   sizeof(lsm1->lsm_md_pool_name)) != 0)
                return false;
 
-       for (idx = 0; idx < lsm1->lsm_md_stripe_count; idx++) {
-               if (!lu_fid_eq(&lsm1->lsm_md_oinfo[idx].lmo_fid,
-                              &lsm2->lsm_md_oinfo[idx].lmo_fid))
-                       return false;
+       if (lmv_dir_striped(lsm1)) {
+               for (idx = 0; idx < lsm1->lsm_md_stripe_count; idx++) {
+                       if (!lu_fid_eq(&lsm1->lsm_md_oinfo[idx].lmo_fid,
+                                      &lsm2->lsm_md_oinfo[idx].lmo_fid))
+                               return false;
+               }
        }
 
        return true;
@@ -87,12 +117,19 @@ static inline void lsm_md_dump(int mask, const struct lmv_stripe_md *lsm)
 {
        int i;
 
-       CDEBUG(mask, "magic %#x stripe count %d master mdt %d hash type %#x "
-               "version %d migrate offset %d migrate hash %#x pool %s\n",
-               lsm->lsm_md_magic, lsm->lsm_md_stripe_count,
-               lsm->lsm_md_master_mdt_index, lsm->lsm_md_hash_type,
-               lsm->lsm_md_layout_version, lsm->lsm_md_migrate_offset,
-               lsm->lsm_md_migrate_hash, lsm->lsm_md_pool_name);
+       /* If lsm_md_magic == LMV_MAGIC_FOREIGN pool_name may not be a null
+        * terminated string so only print LOV_MAXPOOLNAME bytes.
+        */
+       CDEBUG(mask,
+              "magic %#x stripe count %d master mdt %d hash type %#x version %d migrate offset %d migrate hash %#x pool %.*s\n",
+              lsm->lsm_md_magic, lsm->lsm_md_stripe_count,
+              lsm->lsm_md_master_mdt_index, lsm->lsm_md_hash_type,
+              lsm->lsm_md_layout_version, lsm->lsm_md_migrate_offset,
+              lsm->lsm_md_migrate_hash,
+              LOV_MAXPOOLNAME, lsm->lsm_md_pool_name);
+
+       if (!lmv_dir_striped(lsm))
+               return;
 
        for (i = 0; i < lsm->lsm_md_stripe_count; i++)
                CDEBUG(mask, "stripe[%d] "DFID"\n",
@@ -185,10 +222,11 @@ static inline int lmv_name_to_stripe_index(__u32 lmv_hash_type,
        return idx;
 }
 
-static inline bool lmv_is_known_hash_type(__u32 type)
+static inline bool lmv_magic_supported(__u32 lum_magic)
 {
-       return (type & LMV_HASH_TYPE_MASK) == LMV_HASH_TYPE_FNV_1A_64 ||
-              (type & LMV_HASH_TYPE_MASK) == LMV_HASH_TYPE_ALL_CHARS;
+       return lum_magic == LMV_USER_MAGIC ||
+              lum_magic == LMV_USER_MAGIC_SPECIFIC ||
+              lum_magic == LMV_MAGIC_FOREIGN;
 }
 
 #endif