diff options
| author | Peter Rajnoha <prajnoha@redhat.com> | 2015-09-21 13:38:53 +0200 |
|---|---|---|
| committer | Peter Rajnoha <prajnoha@redhat.com> | 2015-09-21 14:21:42 +0200 |
| commit | f01b7afa19433e4d428478fd0bb5e5a33d45685e (patch) | |
| tree | 86edc4caf4bc9746c65f15d9a66f240f0cf16648 | |
| parent | ffa7b37b281faaafaa5053d292502dafcdbf27f9 (diff) | |
| download | lvm2-f01b7afa19433e4d428478fd0bb5e5a33d45685e.tar.gz | |
pv: add 'mem' arg for pv_uuid_dup and pv_name_dup
| -rw-r--r-- | lib/metadata/pv.c | 8 | ||||
| -rw-r--r-- | lib/metadata/pv.h | 4 | ||||
| -rw-r--r-- | lib/report/properties.c | 4 | ||||
| -rw-r--r-- | liblvm/lvm_pv.c | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/lib/metadata/pv.c b/lib/metadata/pv.c index 774cedbc4..ef95175f0 100644 --- a/lib/metadata/pv.c +++ b/lib/metadata/pv.c @@ -29,9 +29,9 @@ char *pv_fmt_dup(const struct physical_volume *pv) return dm_pool_strdup(pv->vg->vgmem, pv->fmt->name); } -char *pv_name_dup(const struct physical_volume *pv) +char *pv_name_dup(struct dm_pool *mem, const struct physical_volume *pv) { - return dm_pool_strdup(pv->vg->vgmem, dev_name(pv->dev)); + return dm_pool_strdup(mem ? mem : pv->vg->vgmem, dev_name(pv->dev)); } /* @@ -42,9 +42,9 @@ struct id pv_id(const struct physical_volume *pv) return pv_field(pv, id); } -char *pv_uuid_dup(const struct physical_volume *pv) +char *pv_uuid_dup(struct dm_pool *mem, const struct physical_volume *pv) { - return id_format_and_copy(pv->vg->vgmem, &pv->id); + return id_format_and_copy(mem ? mem : pv->vg->vgmem, &pv->id); } char *pv_tags_dup(const struct physical_volume *pv) diff --git a/lib/metadata/pv.h b/lib/metadata/pv.h index 2d436cb7b..565d10eeb 100644 --- a/lib/metadata/pv.h +++ b/lib/metadata/pv.h @@ -68,12 +68,12 @@ struct physical_volume { }; char *pv_fmt_dup(const struct physical_volume *pv); -char *pv_name_dup(const struct physical_volume *pv); +char *pv_name_dup(struct dm_pool *mem, const struct physical_volume *pv); struct device *pv_dev(const struct physical_volume *pv); const char *pv_vg_name(const struct physical_volume *pv); char *pv_attr_dup(struct dm_pool *mem, const struct physical_volume *pv); const char *pv_dev_name(const struct physical_volume *pv); -char *pv_uuid_dup(const struct physical_volume *pv); +char *pv_uuid_dup(struct dm_pool *mem, const struct physical_volume *pv); char *pv_tags_dup(const struct physical_volume *pv); uint64_t pv_size(const struct physical_volume *pv); uint64_t pv_size_field(const struct physical_volume *pv); diff --git a/lib/report/properties.c b/lib/report/properties.c index b151190e4..6f55a5602 100644 --- a/lib/report/properties.c +++ b/lib/report/properties.c @@ -149,11 +149,11 @@ static dm_percent_t _metadata_percent(const struct logical_volume *lv) /* PV */ GET_PV_STR_PROPERTY_FN(pv_fmt, pv_fmt_dup(pv)) #define _pv_fmt_set prop_not_implemented_set -GET_PV_STR_PROPERTY_FN(pv_uuid, pv_uuid_dup(pv)) +GET_PV_STR_PROPERTY_FN(pv_uuid, pv_uuid_dup(pv->vg->vgmem, pv)) #define _pv_uuid_set prop_not_implemented_set GET_PV_NUM_PROPERTY_FN(dev_size, SECTOR_SIZE * pv_dev_size(pv)) #define _dev_size_set prop_not_implemented_set -GET_PV_STR_PROPERTY_FN(pv_name, pv_name_dup(pv)) +GET_PV_STR_PROPERTY_FN(pv_name, pv_name_dup(pv->vg->vgmem, pv)) #define _pv_name_set prop_not_implemented_set GET_PV_NUM_PROPERTY_FN(pv_mda_free, SECTOR_SIZE * pv_mda_free(pv)) #define _pv_mda_free_set prop_not_implemented_set diff --git a/liblvm/lvm_pv.c b/liblvm/lvm_pv.c index 5933e0a15..fee1e8d15 100644 --- a/liblvm/lvm_pv.c +++ b/liblvm/lvm_pv.c @@ -37,7 +37,7 @@ const char *lvm_pv_get_uuid(const pv_t pv) { const char *rc; struct saved_env e = store_user_env(pv->vg->cmd); - rc = pv_uuid_dup(pv); + rc = pv_uuid_dup(pv->vg->vgmem, pv); restore_user_env(&e); return rc; } |