mirror of
git://sourceware.org/git/lvm2.git
synced 2024-10-28 20:25:52 +03:00
lv: add common lv_convert_lv fn for use in report and dup, use brackets for invisible devices
The common lv_convert_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:
parent
9e336582f4
commit
1bd83814ce
@ -462,8 +462,7 @@ int lv_kernel_major(const struct logical_volume *lv)
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static char *_do_lv_convert_lv_dup(struct dm_pool *mem, const struct logical_volume *lv,
|
struct logical_volume *lv_convert_lv(const struct logical_volume *lv)
|
||||||
int uuid)
|
|
||||||
{
|
{
|
||||||
struct lv_segment *seg;
|
struct lv_segment *seg;
|
||||||
|
|
||||||
@ -472,13 +471,25 @@ static char *_do_lv_convert_lv_dup(struct dm_pool *mem, const struct logical_vol
|
|||||||
|
|
||||||
/* Temporary mirror is always area_num == 0 */
|
/* Temporary mirror is always area_num == 0 */
|
||||||
if (seg_type(seg, 0) == AREA_LV &&
|
if (seg_type(seg, 0) == AREA_LV &&
|
||||||
is_temporary_mirror_layer(seg_lv(seg, 0))) {
|
is_temporary_mirror_layer(seg_lv(seg, 0)))
|
||||||
if (uuid)
|
return seg_lv(seg, 0);
|
||||||
return lv_uuid_dup(mem, seg_lv(seg, 0));
|
|
||||||
else
|
|
||||||
return lv_name_dup(mem, seg_lv(seg, 0));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
static char *_do_lv_convert_lv_dup(struct dm_pool *mem, const struct logical_volume *lv,
|
||||||
|
int uuid)
|
||||||
|
{
|
||||||
|
struct logical_volume *convert_lv = lv_convert_lv(lv);
|
||||||
|
|
||||||
|
if (convert_lv) {
|
||||||
|
if (uuid)
|
||||||
|
return lv_uuid_dup(mem, convert_lv);
|
||||||
|
else
|
||||||
|
return lv_name_dup(mem, convert_lv);
|
||||||
|
}
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -86,6 +86,7 @@ char *lv_modules_dup(struct dm_pool *mem, const struct logical_volume *lv);
|
|||||||
char *lv_name_dup(struct dm_pool *mem, const struct logical_volume *lv);
|
char *lv_name_dup(struct dm_pool *mem, const struct logical_volume *lv);
|
||||||
char *lv_fullname_dup(struct dm_pool *mem, const struct logical_volume *lv);
|
char *lv_fullname_dup(struct dm_pool *mem, const struct logical_volume *lv);
|
||||||
struct logical_volume *lv_parent(const struct logical_volume *lv);
|
struct logical_volume *lv_parent(const struct logical_volume *lv);
|
||||||
|
struct logical_volume *lv_convert_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);
|
||||||
|
@ -1271,9 +1271,9 @@ static int _chars_disp(struct dm_report *rh, struct dm_pool *mem __attribute__((
|
|||||||
return dm_report_field_string(rh, field, (const char * const *) &data);
|
return dm_report_field_string(rh, field, (const char * const *) &data);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int _uuid_disp(struct dm_report *rh __attribute__((unused)), struct dm_pool *mem,
|
static int _uuid_disp(struct dm_report *rh, struct dm_pool *mem,
|
||||||
struct dm_report_field *field,
|
struct dm_report_field *field,
|
||||||
const void *data, void *private __attribute__((unused)))
|
const void *data, void *private)
|
||||||
{
|
{
|
||||||
char *repstr;
|
char *repstr;
|
||||||
|
|
||||||
@ -1968,17 +1968,15 @@ static int _do_convertlv_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;
|
||||||
const char *repstr;
|
const struct logical_volume *convert_lv = lv_convert_lv(lv);
|
||||||
|
|
||||||
|
if (!convert_lv)
|
||||||
|
return _field_set_value(field, "", NULL);
|
||||||
|
|
||||||
if (uuid)
|
if (uuid)
|
||||||
repstr = lv_convert_lv_uuid_dup(mem, lv);
|
return _uuid_disp(rh, mem, field, &convert_lv->lvid.id[1], private);
|
||||||
else
|
else
|
||||||
repstr = lv_convert_lv_dup(mem, lv);
|
return _lvname_disp(rh, mem, field, convert_lv, private);
|
||||||
|
|
||||||
if (repstr)
|
|
||||||
return _string_disp(rh, mem, field, &repstr, private);
|
|
||||||
|
|
||||||
return _field_set_value(field, "", NULL);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int _convertlv_disp(struct dm_report *rh, struct dm_pool *mem __attribute__((unused)),
|
static int _convertlv_disp(struct dm_report *rh, struct dm_pool *mem __attribute__((unused)),
|
||||||
|
Loading…
Reference in New Issue
Block a user