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

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

Browse Source 
The common lv_data_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:15:22 +01:00
parent d50cd9d8d7
commit cdbf76b2f0
3 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/metadata/lv.c
View File

@ -398,20 +398,27 @@ char *lv_pool_lv_uuid_dup(struct dm_pool *mem, const struct logical_volume *lv)
return _do_lv_pool_lv_dup(mem, lv, 1); return _do_lv_pool_lv_dup(mem, lv, 1);
} }
static char *_do_lv_data_lv_dup(struct dm_pool *mem, const struct logical_volume *lv, struct logical_volume *lv_data_lv(const struct logical_volume *lv)
int uuid)
{ {
struct lv_segment *seg = (lv_is_thin_pool(lv) || lv_is_cache_pool(lv)) ? struct lv_segment *seg = (lv_is_thin_pool(lv) || lv_is_cache_pool(lv)) ?
first_seg(lv) : NULL; first_seg(lv) : NULL;
struct logical_volume *data_lv = seg ? seg_lv(seg, 0) : NULL;
if (seg) { return data_lv;
if (uuid) }
return lv_uuid_dup(mem, seg_lv(seg, 0));
else
return lv_name_dup(mem, seg_lv(seg, 0));
}
static char *_do_lv_data_lv_dup(struct dm_pool *mem, const struct logical_volume *lv,
int uuid)
{
struct logical_volume *data_lv = lv_data_lv(lv);
if (!data_lv)
return NULL; return NULL;
if (uuid)
return lv_uuid_dup(mem, data_lv);
else
return lv_name_dup(mem, data_lv);
} }
char *lv_data_lv_dup(struct dm_pool *mem, const struct logical_volume *lv) char *lv_data_lv_dup(struct dm_pool *mem, const struct logical_volume *lv)

1
lib/metadata/lv.h
View File

@ -89,6 +89,7 @@ struct logical_volume *lv_parent(const struct logical_volume *lv);
struct logical_volume *lv_convert_lv(const struct logical_volume *lv); struct logical_volume *lv_convert_lv(const struct logical_volume *lv);
struct logical_volume *lv_origin_lv(const struct logical_volume *lv); struct logical_volume *lv_origin_lv(const struct logical_volume *lv);
struct logical_volume *lv_mirror_log_lv(const struct logical_volume *lv); struct logical_volume *lv_mirror_log_lv(const struct logical_volume *lv);
struct logical_volume *lv_data_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);

15
lib/report/report.c
View File

@ -1670,16 +1670,15 @@ static int _do_datalv_disp(struct dm_report *rh, struct dm_pool *mem __attribute
int uuid) int uuid)
{ {
const struct logical_volume *lv = (const struct logical_volume *) data; const struct logical_volume *lv = (const struct logical_volume *) data;
const struct lv_segment *seg = (lv_is_pool(lv)) ? first_seg(lv) : NULL; struct logical_volume *data_lv = lv_data_lv(lv);
if (seg) {
if (uuid)
return _uuid_disp(rh, mem, field, &seg_lv(seg, 0)->lvid.id[1], private);
else
return _lvname_disp(rh, mem, field, seg_lv(seg, 0), private);
}
if (!data_lv)
return _field_set_value(field, "", NULL); return _field_set_value(field, "", NULL);
if (uuid)
return _uuid_disp(rh, mem, field, &data_lv->lvid.id[1], private);
else
return _lvname_disp(rh, mem, field, data_lv, private);
} }
static int _datalv_disp(struct dm_report *rh, struct dm_pool *mem __attribute__((unused)), static int _datalv_disp(struct dm_report *rh, struct dm_pool *mem __attribute__((unused)),