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: use brackets for invisible devices when formatting device segments

Browse Source 
Include brackets for the name if the dev is invisible.
This change applies to all callers of _format_pvsegs fn:
  - lvseg_devices (the "lvs -o devices")
  - lvseg_metadata_devices (the "lvs -o metadata_devices)
  - lvseg_seg_pe_ranges (the "lvs -o seg_pe_ranges")
  - lvseg_seg_metadata_le_ranges (the "lvs -o seg_metadata_le_ranges")
This commit is contained in:
Peter Rajnoha 2016-01-12 14:49:56 +01:00
parent f1fe7af014
commit 7f74a99502
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/metadata/lv.c
View File

@ -31,10 +31,13 @@ static int _utsinit = 0;
static char *_format_pvsegs(struct dm_pool *mem, const struct lv_segment *seg, static char *_format_pvsegs(struct dm_pool *mem, const struct lv_segment *seg,
int range_format, int metadata_areas_only) int range_format, int metadata_areas_only)
{ {
static const char pool_grow_object_failed_msg[] = "dm_pool_grow_object failed";
unsigned int s; unsigned int s;
const char *name = NULL; const char *name = NULL;
uint32_t extent = 0; uint32_t extent = 0;
char extent_str[32]; char extent_str[32];
struct logical_volume *lv;
int visible = 1;
if (!dm_pool_begin_object(mem, 256)) { if (!dm_pool_begin_object(mem, 256)) {
log_error("dm_pool_begin_object failed"); log_error("dm_pool_begin_object failed");
@ -47,7 +50,9 @@ static char *_format_pvsegs(struct dm_pool *mem, const struct lv_segment *seg,
for (s = 0; s < seg->area_count; s++) { for (s = 0; s < seg->area_count; s++) {
switch (metadata_areas_only ? seg_metatype(seg, s) : seg_type(seg, s)) { switch (metadata_areas_only ? seg_metatype(seg, s) : seg_type(seg, s)) {
case AREA_LV: case AREA_LV:
name = metadata_areas_only ? seg_metalv(seg, s)->name : seg_lv(seg, s)->name; lv = metadata_areas_only ? seg_metalv(seg, s) : seg_lv(seg, s);
visible = lv_is_visible(lv);
name = lv->name;
extent = metadata_areas_only ? seg_le(seg, s) : 0; extent = metadata_areas_only ? seg_le(seg, s) : 0;
break; break;
case AREA_PV: case AREA_PV:
@ -66,8 +71,18 @@ static char *_format_pvsegs(struct dm_pool *mem, const struct lv_segment *seg,
return NULL; return NULL;
} }
if (!visible && !dm_pool_grow_object(mem, "[", 1)) {
log_error(pool_grow_object_failed_msg);
return NULL;
}
if (!dm_pool_grow_object(mem, name, strlen(name))) { if (!dm_pool_grow_object(mem, name, strlen(name))) {
log_error("dm_pool_grow_object failed"); log_error(pool_grow_object_failed_msg);
return NULL;
}
if (!visible && !dm_pool_grow_object(mem, "]", 1)) {
log_error(pool_grow_object_failed_msg);
return NULL; return NULL;
} }
@ -79,7 +94,7 @@ static char *_format_pvsegs(struct dm_pool *mem, const struct lv_segment *seg,
return NULL; return NULL;
} }
if (!dm_pool_grow_object(mem, extent_str, strlen(extent_str))) { if (!dm_pool_grow_object(mem, extent_str, strlen(extent_str))) {
log_error("dm_pool_grow_object failed"); log_error(pool_grow_object_failed_msg);
return NULL; return NULL;
} }
@ -90,14 +105,14 @@ static char *_format_pvsegs(struct dm_pool *mem, const struct lv_segment *seg,
return NULL; return NULL;
} }
if (!dm_pool_grow_object(mem, extent_str, strlen(extent_str))) { if (!dm_pool_grow_object(mem, extent_str, strlen(extent_str))) {
log_error("dm_pool_grow_object failed"); log_error(pool_grow_object_failed_msg);
return NULL; return NULL;
} }
} }
if ((s != seg->area_count - 1) && if ((s != seg->area_count - 1) &&
!dm_pool_grow_object(mem, range_format ? " " : ",", 1)) { !dm_pool_grow_object(mem, range_format ? " " : ",", 1)) {
log_error("dm_pool_grow_object failed"); log_error(pool_grow_object_failed_msg);
return NULL; return NULL;
} }
} }