Reflect dm_config API update

diff --git a/lib/thin/thin.c b/lib/thin/thin.c
index 153bab2c9a5b3df06e92c96b2f77d4119e605fd5..7565e1b25e63baeb67c340054ce50d3cde3f27a2 100644 (file)
--- a/lib/thin/thin.c
+++ b/lib/thin/thin.c
@@ -46,28 +46,24 @@ static const char *_thin_pool_name(const struct lv_segment *seg)
 static int _thin_pool_text_import(struct lv_segment *seg, const struct dm_config_node *sn,
                        struct dm_hash_table *pv_hash __attribute__((unused)))
 {
-       const struct dm_config_node *cn;
+       const char *lv_name;
 
-       if (!(cn = dm_config_find_node(sn, "data")) ||
-           !cn->v || cn->v->type != DM_CFG_STRING)
+       if (!dm_config_get_str(sn, "data", &lv_name))
                return SEG_LOG_ERROR("Thin pool data must be a string in");
 
-       if (!(seg->data_lv = find_lv(seg->lv->vg, cn->v->v.str)))
-               return SEG_LOG_ERROR("Unknown pool data %s in",
-                                    cn->v->v.str);
+       if (!(seg->data_lv = find_lv(seg->lv->vg, lv_name)))
+               return SEG_LOG_ERROR("Unknown pool data %s in", lv_name);
 
-       if (!(cn = dm_config_find_node(sn, "metadata")) ||
-           !cn->v || cn->v->type != DM_CFG_STRING)
+       if (!dm_config_get_str(sn, "metadata", &lv_name))
                return SEG_LOG_ERROR("Thin pool metadata must be a string in");
 
-       if (!(seg->metadata_lv = find_lv(seg->lv->vg, cn->v->v.str)))
-               return SEG_LOG_ERROR("Unknown pool metadata %s in",
-                                    cn->v->v.str);
+       if (!(seg->metadata_lv = find_lv(seg->lv->vg, lv_name)))
+               return SEG_LOG_ERROR("Unknown pool metadata %s in", lv_name);
 
        if (!dm_config_get_uint64(sn, "transaction_id", &seg->transaction_id))
                return SEG_LOG_ERROR("Could not read transaction_id for");
 
-       if (dm_config_find_node(sn, "zero_new_blocks") &&
+       if (dm_config_has_node(sn, "zero_new_blocks") &&
            !dm_config_get_uint32(sn, "zero_new_blocks", &seg->zero_new_blocks))
                return SEG_LOG_ERROR("Could not read zero_new_blocks for");
 
@@ -93,23 +89,20 @@ static const char *_thin_name(const struct lv_segment *seg)
 static int _thin_text_import(struct lv_segment *seg, const struct dm_config_node *sn,
                        struct dm_hash_table *pv_hash __attribute__((unused)))
 {
-       const struct dm_config_node *cn;
+       const char *lv_name;
 
-       if (!(cn = dm_config_find_node(sn, "thin_pool")) ||
-           !cn->v || cn->v->type != DM_CFG_STRING)
+       if (!dm_config_get_str(sn, "thin_pool", &lv_name))
                return SEG_LOG_ERROR("Thin pool must be a string in");
 
-       if (!(seg->thin_pool_lv = find_lv(seg->lv->vg, cn->v->v.str)))
-               return SEG_LOG_ERROR("Unknown thin pool %s in",
-                                    cn->v->v.str);
+       if (!(seg->thin_pool_lv = find_lv(seg->lv->vg, lv_name)))
+               return SEG_LOG_ERROR("Unknown thin pool %s in", lv_name);
 
-       if ((cn = dm_config_find_node(sn, "origin"))) {
-                if (!cn->v || cn->v->type != DM_CFG_STRING)
+       if (dm_config_has_node(sn, "origin")) {
+               if (!dm_config_get_str(sn, "origin", &lv_name))
                        return SEG_LOG_ERROR("Thin pool origin must be a string in");
 
-               if (!(seg->origin = find_lv(seg->lv->vg, cn->v->v.str)))
-                       return SEG_LOG_ERROR("Unknown origin %s in",
-                                            cn->v->v.str);
+               if (!(seg->origin = find_lv(seg->lv->vg, lv_name)))
+                       return SEG_LOG_ERROR("Unknown origin %s in", lv_name);
        }
 
        if (!dm_config_get_uint64(sn, "device_id", &seg->device_id))