shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

lv: add common lv_pool_lv fn for use in report and dup, use brackets for invisible devices

Browse Source 
The common lv_pool_lv fn avoids code duplication and also
the reporting part now uses _lvname_disp and _uuid_disp to display
name and uuid respectively, including brackets for the name if the
dev is invisible.
This commit is contained in:
Peter Rajnoha 2016-01-12 11:53:39 +01:00
parent 42fcbc1fd4
commit f1fe7af014
3 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/metadata/lv.c
View File

@ -370,22 +370,27 @@ char *lv_mirror_log_uuid_dup(struct dm_pool *mem, const struct logical_volume *l
return _do_lv_mirror_log_dup(mem, lv, 1); return _do_lv_mirror_log_dup(mem, lv, 1);
} }
struct logical_volume *lv_pool_lv(const struct logical_volume *lv)
{
struct lv_segment *seg = (lv_is_thin_volume(lv) || lv_is_cache(lv)) ?
first_seg(lv) : NULL;
struct logical_volume *pool_lv = seg ? seg->pool_lv : NULL;
return pool_lv;
}
static char *_do_lv_pool_lv_dup(struct dm_pool *mem, const struct logical_volume *lv, static char *_do_lv_pool_lv_dup(struct dm_pool *mem, const struct logical_volume *lv,
int uuid) int uuid)
{ {
struct lv_segment *seg; struct logical_volume *pool_lv = lv_pool_lv(lv);
dm_list_iterate_items(seg, &lv->segments) { if (!pool_lv)
if (seg->pool_lv && return NULL;
(seg_is_thin_volume(seg) || seg_is_cache(seg))) {
if (uuid)
return lv_uuid_dup(mem, seg->pool_lv);
else
return lv_name_dup(mem, seg->pool_lv);
}
}
return NULL; if (uuid)
return lv_uuid_dup(mem, pool_lv);
else
return lv_name_dup(mem, pool_lv);
} }
char *lv_pool_lv_dup(struct dm_pool *mem, const struct logical_volume *lv) char *lv_pool_lv_dup(struct dm_pool *mem, const struct logical_volume *lv)

1
lib/metadata/lv.h
View File

@ -95,6 +95,7 @@ struct logical_volume *lv_origin(const struct logical_volume *lv);
struct logical_volume *lv_mirror_log(const struct logical_volume *lv); struct logical_volume *lv_mirror_log(const struct logical_volume *lv);
struct logical_volume *lv_data(const struct logical_volume *lv); struct logical_volume *lv_data(const struct logical_volume *lv);
struct logical_volume *lv_metadata_lv(const struct logical_volume *lv); struct logical_volume *lv_metadata_lv(const struct logical_volume *lv);
struct logical_volume *lv_pool_lv(const struct logical_volume *lv);
char *lv_parent_dup(struct dm_pool *mem, const struct logical_volume *lv); char *lv_parent_dup(struct dm_pool *mem, const struct logical_volume *lv);
char *lv_origin_dup(struct dm_pool *mem, const struct logical_volume *lv); char *lv_origin_dup(struct dm_pool *mem, const struct logical_volume *lv);
char *lv_origin_uuid_dup(struct dm_pool *mem, const struct logical_volume *lv); char *lv_origin_uuid_dup(struct dm_pool *mem, const struct logical_volume *lv);

16
lib/report/report.c
View File

@ -1732,17 +1732,15 @@ static int _do_poollv_disp(struct dm_report *rh, struct dm_pool *mem,
int uuid) int uuid)
{ {
const struct logical_volume *lv = (const struct logical_volume *) data; const struct logical_volume *lv = (const struct logical_volume *) data;
struct lv_segment *seg = (lv_is_thin_volume(lv) || lv_is_cache(lv)) ? struct logical_volume *pool_lv = lv_pool_lv(lv);
first_seg(lv) : NULL;
if (seg) { if (!pool_lv)
if (uuid) return _field_set_value(field, "", NULL);
return _uuid_disp(rh, mem, field, &seg->pool_lv->lvid.id[1], private);
else
return _lvname_disp(rh, mem, field, seg->pool_lv, private);
}
return _field_set_value(field, "", NULL); if (uuid)
return _uuid_disp(rh, mem, field, &pool_lv->lvid.id[1], private);
else
return _lvname_disp(rh, mem, field, pool_lv, private);
} }
static int _poollv_disp(struct dm_report *rh, struct dm_pool *mem __attribute__((unused)), static int _poollv_disp(struct dm_report *rh, struct dm_pool *mem __attribute__((unused)),