shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-17 06:04:23 +03:00
Code Releases Activity

commands: lvdisplay: recognize -H|--history switch

Browse Source
This commit is contained in:
Peter Rajnoha 2016-03-04 10:27:45 +01:00
parent ad9cbe2714
commit b114b4d723
2 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/display/display.c
View File

@ -332,6 +332,34 @@ void lvdisplay_colons(const struct logical_volume *lv)
inkernel ? info.major : -1, inkernel ? info.minor : -1); inkernel ? info.major : -1, inkernel ? info.minor : -1);
} }
static int _lvdisplay_historical_full(struct cmd_context *cmd,
const struct logical_volume *lv)
{
char uuid[64] __attribute__((aligned(8)));
int lvm1compat = find_config_tree_bool(cmd, global_lvdisplay_shows_full_device_path_CFG, NULL);
struct historical_logical_volume *hlv = lv->this_glv->historical;
if (!id_write_format(&hlv->lvid.id[1], uuid, sizeof(uuid)))
return_0;
log_print("--- Historical Logical volume ---");
if (lvm1compat)
/* /dev/vgname/lvname doen't actually exist for historical devices */
log_print("LV Name %s%s/%s",
hlv->vg->cmd->dev_dir, hlv->vg->name, hlv->name);
else
log_print("LV Name %s%s", HISTORICAL_LV_PREFIX, hlv->name);
log_print("VG Name %s", hlv->vg->name);
log_print("LV UUID %s", uuid);
log_print("LV Creation time %s", lv_creation_time_dup(cmd->mem, lv, 1));
log_print("LV Removal time %s", lv_removal_time_dup(cmd->mem, lv, 1));
log_print(" ");
return 1;
}
int lvdisplay_full(struct cmd_context *cmd, int lvdisplay_full(struct cmd_context *cmd,
const struct logical_volume *lv, const struct logical_volume *lv,
void *handle __attribute__((unused))) void *handle __attribute__((unused)))
@ -349,6 +377,9 @@ int lvdisplay_full(struct cmd_context *cmd,
int thin_active = 0; int thin_active = 0;
dm_percent_t thin_percent; dm_percent_t thin_percent;
if (lv_is_historical(lv))
return _lvdisplay_historical_full(cmd, lv);
if (!id_write_format(&lv->lvid.id[1], uuid, sizeof(uuid))) if (!id_write_format(&lv->lvid.id[1], uuid, sizeof(uuid)))
return_0; return_0;

10
tools/commands.h
View File

@ -409,6 +409,7 @@ xx(lvdisplay,
"\t[-d|--debug]\n" "\t[-d|--debug]\n"
"\t[--foreign]\n" "\t[--foreign]\n"
"\t[-h|--help]\n" "\t[-h|--help]\n"
"\t[-H|--history]\n"
"\t[--ignorelockingfailure]\n" "\t[--ignorelockingfailure]\n"
"\t[--ignoreskippedcluster]\n" "\t[--ignoreskippedcluster]\n"
"\t[-m|--maps]\n" "\t[-m|--maps]\n"
@ -429,6 +430,7 @@ xx(lvdisplay,
"\t[-d|--debug]\n" "\t[-d|--debug]\n"
"\t[--foreign]\n" "\t[--foreign]\n"
"\t[-h|--help]\n" "\t[-h|--help]\n"
"\t[-H|--history]\n"
"\t[--ignorelockingfailure]\n" "\t[--ignorelockingfailure]\n"
"\t[--ignoreskippedcluster]\n" "\t[--ignoreskippedcluster]\n"
"\t[--noheadings]\n" "\t[--noheadings]\n"
@ -447,10 +449,10 @@ xx(lvdisplay,
"\t[LogicalVolume[Path] [LogicalVolume[Path]...]]\n", "\t[LogicalVolume[Path] [LogicalVolume[Path]...]]\n",
aligned_ARG, all_ARG, binary_ARG, colon_ARG, columns_ARG, foreign_ARG, aligned_ARG, all_ARG, binary_ARG, colon_ARG, columns_ARG, foreign_ARG,
ignorelockingfailure_ARG, ignoreskippedcluster_ARG, maps_ARG, history_ARG, ignorelockingfailure_ARG, ignoreskippedcluster_ARG,
noheadings_ARG, nosuffix_ARG, options_ARG, sort_ARG, partial_ARG, maps_ARG, noheadings_ARG, nosuffix_ARG, options_ARG, sort_ARG,
readonly_ARG, segments_ARG, select_ARG, separator_ARG, shared_ARG, partial_ARG, readonly_ARG, segments_ARG, select_ARG, separator_ARG,
unbuffered_ARG, units_ARG) shared_ARG, unbuffered_ARG, units_ARG)
xx(lvextend, xx(lvextend,
"Add space to a logical volume", "Add space to a logical volume",