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

report: report historical LV names with '-' prefix

Browse Source 
All names for historical LVs are prefixed with '-' character to make clear
difference between live and historical LVs. The '-' can't be set by users
for live LV names during lvcreate hence we never get into a conflict with
the names that user defines for live LVs.
This commit is contained in:
Peter Rajnoha 2016-03-01 15:24:07 +01:00
parent 8b9953e8c5
commit f228750386
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/report/report.c
View File

@ -1685,27 +1685,36 @@ static int _lvname_disp(struct dm_report *rh, struct dm_pool *mem,
{
struct cmd_context *cmd = (struct cmd_context *) private;
const struct logical_volume *lv = (const struct logical_volume *) data;
int is_historical = lv_is_historical(lv);
const char *tmp_lvname;
char *repstr, *lvname;
size_t len;
if (lv_is_historical(lv))
return _string_disp(rh, mem, field, &lv->this_glv->historical->name, private);
if (lv_is_visible(lv) || !cmd->report_mark_hidden_devices)
if (!is_historical && (lv_is_visible(lv) || !cmd->report_mark_hidden_devices))
return _field_string(rh, field, lv->name);
len = strlen(lv->name) + 3;
if (is_historical) {
tmp_lvname = lv->this_glv->historical->name;
len = strlen(tmp_lvname) + strlen(HISTORICAL_LV_PREFIX) + 1;
} else {
tmp_lvname = lv->name;
len = strlen(tmp_lvname) + 3;
}
if (!(repstr = dm_pool_zalloc(mem, len))) {
log_error("dm_pool_alloc failed");
return 0;
}
if (dm_snprintf(repstr, len, "[%s]", lv->name) < 0) {
if (dm_snprintf(repstr, len, "%s%s%s",
is_historical ? HISTORICAL_LV_PREFIX : "[",
tmp_lvname,
is_historical ? "" : "]") < 0) {
log_error("lvname snprintf failed");
return 0;
}
if (!(lvname = dm_pool_strdup(mem, lv->name))) {
if (!(lvname = dm_pool_strdup(mem, tmp_lvname))) {
log_error("dm_pool_strdup failed");
return 0;
}