LU-14480 pool: wrong usage with ost list

[fs/lustre-release.git] / lustre / lod / lod_qos.c

diff --git a/lustre/lod/lod_qos.c b/lustre/lod/lod_qos.c
index 40376a0..fa5903e 100644 (file)
--- a/lustre/lod/lod_qos.c
+++ b/lustre/lod/lod_qos.c
@@ -2242,9 +2242,13 @@ int lod_qos_parse_config(const struct lu_env *env, struct lod_object *lo,
                }
 
                pool_name = NULL;
+               if (def_pool[0] != '\0')
+                       pool_name = def_pool;
+
                if (v1->lmm_magic == LOV_USER_MAGIC_V3 ||
                    v1->lmm_magic == LOV_USER_MAGIC_SPECIFIC) {
                        v3 = (struct lov_user_md_v3 *)v1;
+
                        if (v3->lmm_pool_name[0] != '\0')
                                pool_name = v3->lmm_pool_name;
 
@@ -2252,12 +2256,11 @@ int lod_qos_parse_config(const struct lu_env *env, struct lod_object *lo,
                                rc = lod_comp_copy_ost_lists(lod_comp, v3);
                                if (rc)
                                        GOTO(free_comp, rc);
+
+                               pool_name = NULL;
                        }
                }
 
-               if (pool_name == NULL && def_pool[0] != '\0')
-                       pool_name = def_pool;
-
                if (v1->lmm_pattern == 0)
                        v1->lmm_pattern = LOV_PATTERN_RAID0;
                if (lov_pattern(v1->lmm_pattern) != LOV_PATTERN_RAID0 &&