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

Fix counting of virtual origin LVs in vg_validate. (mbroz)

Browse Source
This commit is contained in:
Alasdair Kergon 2009-05-27 13:19:34 +00:00
parent fcc2a694eb
commit ea91a71bb9
2 changed files with 11 additions and 7 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.48 - Version 2.02.48 -
=============================== ===============================
Fix counting of virtual origin LVs in vg_validate.
Attempt to load dm-zero module if zero target needed but not present. Attempt to load dm-zero module if zero target needed but not present.
Version 2.02.47 - 22nd May 2009 Version 2.02.47 - 22nd May 2009

17
lib/metadata/metadata.c
View File

@ -1449,7 +1449,7 @@ int vg_validate(struct volume_group *vg)
struct lv_list *lvl, *lvl2; struct lv_list *lvl, *lvl2;
char uuid[64] __attribute((aligned(8))); char uuid[64] __attribute((aligned(8)));
int r = 1; int r = 1;
uint32_t lv_count; uint32_t hidden_lv_count = 0;
/* FIXME Also check there's no data/metadata overlap */ /* FIXME Also check there's no data/metadata overlap */
@ -1486,17 +1486,20 @@ int vg_validate(struct volume_group *vg)
/* /*
* Count all non-snapshot invisible LVs * Count all non-snapshot invisible LVs
*/ */
lv_count = 0;
dm_list_iterate_items(lvl, &vg->lvs) { dm_list_iterate_items(lvl, &vg->lvs) {
if (lvl->lv->status & VISIBLE_LV) if (lvl->lv->status & VISIBLE_LV)
continue; continue;
/* snapshots */ /* snapshots */
if (lv_is_cow(lvl->lv) || lv_is_origin(lvl->lv)) if (lv_is_cow(lvl->lv))
continue;
/* virtual origins are always hidden */
if (lv_is_origin(lvl->lv) && !lv_is_virtual_origin(lvl->lv))
continue; continue;
/* count other non-snapshot invisible volumes */ /* count other non-snapshot invisible volumes */
lv_count++; hidden_lv_count++;
/* /*
* FIXME: add check for unreferenced invisible LVs * FIXME: add check for unreferenced invisible LVs
@ -1510,11 +1513,11 @@ int vg_validate(struct volume_group *vg)
* all volumes = visible LVs + snapshot_cows + invisible LVs * all volumes = visible LVs + snapshot_cows + invisible LVs
*/ */
if (((uint32_t) dm_list_size(&vg->lvs)) != if (((uint32_t) dm_list_size(&vg->lvs)) !=
vg_visible_lvs(vg) + snapshot_count(vg) + lv_count) { vg_visible_lvs(vg) + snapshot_count(vg) + hidden_lv_count) {
log_error("Internal error: #internal LVs (%u) != #LVs (%" log_error("Internal error: #internal LVs (%u) != #LVs (%"
PRIu32 ") + #snapshots (%" PRIu32 ") + #invisible LVs %u in VG %s", PRIu32 ") + #snapshots (%" PRIu32 ") + #internal LVs %u in VG %s",
dm_list_size(&vg->lvs), vg_visible_lvs(vg), dm_list_size(&vg->lvs), vg_visible_lvs(vg),
snapshot_count(vg), lv_count, vg->name); snapshot_count(vg), hidden_lv_count, vg->name);
r = 0; r = 0;
} }