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 45c5366..5e03321 100644 (file)
--- a/lustre/include/lustre_lmv.h
+++ b/lustre/include/lustre_lmv.h
@@ -54,12 +54,6 @@ struct lmv_stripe_md {
        struct lmv_oinfo lsm_md_oinfo[0];
 };
 
-static inline bool lmv_is_known_hash_type(__u32 type)
-{
-       return (type & LMV_HASH_TYPE_MASK) == LMV_HASH_TYPE_FNV_1A_64 ||
-              (type & LMV_HASH_TYPE_MASK) == LMV_HASH_TYPE_ALL_CHARS;
-}
-
 static inline bool lmv_dir_striped(const struct lmv_stripe_md *lsm)
 {
        return lsm && lsm->lsm_md_magic == LMV_MAGIC;
@@ -88,12 +82,6 @@ static inline bool lmv_dir_bad_hash(const struct lmv_stripe_md *lsm)
        return !lmv_is_known_hash_type(lsm->lsm_md_hash_type);
 }
 
-/* NB, this is checking directory default LMV */
-static inline bool lmv_dir_qos_mkdir(const struct lmv_stripe_md *lsm)
-{
-       return lsm && (lsm->lsm_md_hash_type & LMV_HASH_FLAG_SPACE);
-}
-
 static inline bool
 lsm_md_eq(const struct lmv_stripe_md *lsm1, const struct lmv_stripe_md *lsm2)
 {
@@ -110,8 +98,8 @@ 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;
 
        if (lmv_dir_striped(lsm1)) {
@@ -129,12 +117,16 @@ 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;