shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

Reflect dm_config API update

Browse Source
This commit is contained in:
Zdenek Kabelac 2011-09-01 10:16:32 +00:00
parent 97a4b5165e
commit 466098cd1c
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/thin/thin.c
View File

@ -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, static int _thin_pool_text_import(struct lv_segment *seg, const struct dm_config_node *sn,
struct dm_hash_table *pv_hash __attribute__((unused))) 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")) || if (!dm_config_get_str(sn, "data", &lv_name))
!cn->v || cn->v->type != DM_CFG_STRING)
return SEG_LOG_ERROR("Thin pool data must be a string in"); 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))) if (!(seg->data_lv = find_lv(seg->lv->vg, lv_name)))
return SEG_LOG_ERROR("Unknown pool data %s in", return SEG_LOG_ERROR("Unknown pool data %s in", lv_name);
cn->v->v.str);
if (!(cn = dm_config_find_node(sn, "metadata")) || if (!dm_config_get_str(sn, "metadata", &lv_name))
!cn->v || cn->v->type != DM_CFG_STRING)
return SEG_LOG_ERROR("Thin pool metadata must be a string in"); 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))) if (!(seg->metadata_lv = find_lv(seg->lv->vg, lv_name)))
return SEG_LOG_ERROR("Unknown pool metadata %s in", return SEG_LOG_ERROR("Unknown pool metadata %s in", lv_name);
cn->v->v.str);
if (!dm_config_get_uint64(sn, "transaction_id", &seg->transaction_id)) if (!dm_config_get_uint64(sn, "transaction_id", &seg->transaction_id))
return SEG_LOG_ERROR("Could not read transaction_id for"); 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)) !dm_config_get_uint32(sn, "zero_new_blocks", &seg->zero_new_blocks))
return SEG_LOG_ERROR("Could not read zero_new_blocks for"); 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, static int _thin_text_import(struct lv_segment *seg, const struct dm_config_node *sn,
struct dm_hash_table *pv_hash __attribute__((unused))) 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")) || if (!dm_config_get_str(sn, "thin_pool", &lv_name))
!cn->v || cn->v->type != DM_CFG_STRING)
return SEG_LOG_ERROR("Thin pool must be a string in"); 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))) if (!(seg->thin_pool_lv = find_lv(seg->lv->vg, lv_name)))
return SEG_LOG_ERROR("Unknown thin pool %s in", return SEG_LOG_ERROR("Unknown thin pool %s in", lv_name);
cn->v->v.str);
if ((cn = dm_config_find_node(sn, "origin"))) { if (dm_config_has_node(sn, "origin")) {
if (!cn->v || cn->v->type != DM_CFG_STRING) if (!dm_config_get_str(sn, "origin", &lv_name))
return SEG_LOG_ERROR("Thin pool origin must be a string in"); return SEG_LOG_ERROR("Thin pool origin must be a string in");
if (!(seg->origin = find_lv(seg->lv->vg, cn->v->v.str))) if (!(seg->origin = find_lv(seg->lv->vg, lv_name)))
return SEG_LOG_ERROR("Unknown origin %s in", return SEG_LOG_ERROR("Unknown origin %s in", lv_name);
cn->v->v.str);
} }
if (!dm_config_get_uint64(sn, "device_id", &seg->device_id)) if (!dm_config_get_uint64(sn, "device_id", &seg->device_id))