diff options
| author | Peter Rajnoha <prajnoha@redhat.com> | 2015-09-21 12:23:03 +0200 |
|---|---|---|
| committer | Peter Rajnoha <prajnoha@redhat.com> | 2015-09-21 12:25:31 +0200 |
| commit | 0e3042f488dd22b99b4ac0705a18bb03ee48a4d3 (patch) | |
| tree | 4b6f788c0dcc05d1189b63bb571fdb1be45f2c00 | |
| parent | f644431346465389bf1aaab0e9880cf0b1751c5a (diff) | |
| download | lvm2-0e3042f488dd22b99b4ac0705a18bb03ee48a4d3.tar.gz | |
lv: add 'mem' arg for lv_uuid_dup
| -rw-r--r-- | lib/metadata/lv.c | 4 | ||||
| -rw-r--r-- | lib/metadata/lv.h | 2 | ||||
| -rw-r--r-- | lib/report/properties.c | 2 | ||||
| -rw-r--r-- | liblvm/lvm_lv.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/lib/metadata/lv.c b/lib/metadata/lv.c index c775077b5..300914978 100644 --- a/lib/metadata/lv.c +++ b/lib/metadata/lv.c @@ -479,9 +479,9 @@ char *lv_dmpath_dup(struct dm_pool *mem, const struct logical_volume *lv) return repstr; } -char *lv_uuid_dup(const struct logical_volume *lv) +char *lv_uuid_dup(struct dm_pool *mem, const struct logical_volume *lv) { - return id_format_and_copy(lv->vg->vgmem, &lv->lvid.id[1]); + return id_format_and_copy(mem ? mem : lv->vg->vgmem, &lv->lvid.id[1]); } char *lv_tags_dup(const struct logical_volume *lv) diff --git a/lib/metadata/lv.h b/lib/metadata/lv.h index a2b0f6f7a..bc82d3ef1 100644 --- a/lib/metadata/lv.h +++ b/lib/metadata/lv.h @@ -62,7 +62,7 @@ uint64_t lv_size(const struct logical_volume *lv); uint64_t lv_metadata_size(const struct logical_volume *lv); char *lv_attr_dup_with_info_and_seg_status(struct dm_pool *mem, const struct lv_with_info_and_seg_status *lvdm); char *lv_attr_dup(struct dm_pool *mem, const struct logical_volume *lv); -char *lv_uuid_dup(const struct logical_volume *lv); +char *lv_uuid_dup(struct dm_pool *mem, const struct logical_volume *lv); char *lv_tags_dup(const struct logical_volume *lv); char *lv_path_dup(struct dm_pool *mem, const struct logical_volume *lv); char *lv_dmpath_dup(struct dm_pool *mem, const struct logical_volume *lv); diff --git a/lib/report/properties.c b/lib/report/properties.c index e38359bbf..4b2aff55c 100644 --- a/lib/report/properties.c +++ b/lib/report/properties.c @@ -264,7 +264,7 @@ GET_PV_NUM_PROPERTY_FN(pv_ba_size, SECTOR_SIZE * pv->ba_size) #define _cache_write_misses_get prop_not_implemented_get /* LV */ -GET_LV_STR_PROPERTY_FN(lv_uuid, lv_uuid_dup(lv)) +GET_LV_STR_PROPERTY_FN(lv_uuid, lv_uuid_dup(lv->vg->vgmem, lv)) #define _lv_uuid_set prop_not_implemented_set GET_LV_STR_PROPERTY_FN(lv_name, lv_name_dup(lv->vg->vgmem, lv)) #define _lv_name_set prop_not_implemented_set diff --git a/liblvm/lvm_lv.c b/liblvm/lvm_lv.c index 33af34857..95d8492d0 100644 --- a/liblvm/lvm_lv.c +++ b/liblvm/lvm_lv.c @@ -56,7 +56,7 @@ const char *lvm_lv_get_uuid(const lv_t lv) { const char *rc; struct saved_env e = store_user_env(lv->vg->cmd); - rc = lv_uuid_dup(lv); + rc = lv_uuid_dup(lv->vg->vgmem, lv); restore_user_env(&e); return rc; } |