shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

Fix pvs segfault when run with orphan PV and vg_mda_size or vg_mda_free fields

Browse Source 
We display '0' for these fields now in this case.  Ideally these values are
undefined for an orphan PV but today there is no way to specify undefined
with display functions such as _size64_disp().
This commit is contained in:
Dave Wysochanski 2009-01-10 15:04:28 +00:00
parent cde6f0b767
commit 2815870302
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.44 -
====================================
Fix pvs segfault when run with orphan PV and vg_mda_size or vg_mda_free.
Display a 'dev_size' of zero for missing devices in reports.
Add pv_mda_size to pvs and vg_mda_size to vgs.
Fix lvmdump /sys listing to include virtual devices directory.

16
lib/report/report.c
View File

@ -926,7 +926,13 @@ static int _vgmdasize_disp(struct dm_report *rh, struct dm_pool *mem,
const struct volume_group *vg = (const struct volume_group *) data;
uint64_t min_mda_size;
min_mda_size = _find_min_mda_size(&vg->fid->metadata_areas);
/*
* An orphan PV will have vg->fid == NULL
*/
if (vg->fid == NULL)
min_mda_size = UINT64_C(0);
else
min_mda_size = _find_min_mda_size(&vg->fid->metadata_areas);
return _size64_disp(rh, mem, field, &min_mda_size, private);
}
@ -939,6 +945,12 @@ static int _vgmdafree_disp(struct dm_report *rh, struct dm_pool *mem,
uint64_t freespace = UINT64_MAX, mda_free;
struct metadata_area *mda;
/*
* An orphan PV will have vg->fid == NULL
*/
if (vg->fid == NULL)
goto calc_done;
dm_list_iterate_items(mda, &vg->fid->metadata_areas) {
if (!mda->ops->mda_free_sectors)
continue;
@ -946,7 +958,7 @@ static int _vgmdafree_disp(struct dm_report *rh, struct dm_pool *mem,
if (mda_free < freespace)
freespace = mda_free;
}
calc_done:
if (freespace == UINT64_MAX)
freespace = UINT64_C(0);