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

Fix pvmove segment splitting.

Browse Source 
Abstract vg_validate.
This commit is contained in:
Alasdair Kergon 2005-07-12 19:40:59 +00:00
parent 10b44b2d4a
commit 0440a206dc
5 changed files with 42 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WHATS_NEW
View File

@ -1,5 +1,7 @@
Version 2.01.13 - Version 2.01.13 -
================================ ================================
Fix pvmove segment splitting.
Abstract vg_validate.
Only make one attempt at contiguous allocation. Only make one attempt at contiguous allocation.
Fix lvm1 format metadata read. Fix lvm1 format metadata read.
Fix lvm1 format non-mirror lvcreate. Fix lvm1 format non-mirror lvcreate.

10
lib/metadata/merge.c
View File

@ -197,12 +197,13 @@ static int _lv_split_segment(struct logical_volume *lv, struct lv_segment *seg,
break; break;
case AREA_PV: case AREA_PV:
if (!assign_peg_to_lvseg(seg_pv(seg, s), if (!(seg_pvseg(split_seg, s) =
assign_peg_to_lvseg(seg_pv(seg, s),
seg_pe(seg, s) + seg_pe(seg, s) +
seg->area_len, seg->area_len,
seg_pvseg(seg, s)->len - seg_pvseg(seg, s)->len -
seg->area_len, seg->area_len,
split_seg, s)) { split_seg, s))) {
stack; stack;
return 0; return 0;
} }
@ -246,5 +247,10 @@ int lv_split_segment(struct logical_volume *lv, uint32_t le)
return 0; return 0;
} }
if (!vg_validate(lv->vg)) {
stack;
return 0;
}
return 1; return 1;
} }

25
lib/metadata/metadata.c
View File

@ -697,14 +697,8 @@ int vg_remove(struct volume_group *vg)
return 1; return 1;
} }
/* int vg_validate(struct volume_group *vg)
* After vg_write() returns success,
* caller MUST call either vg_commit() or vg_revert()
*/
int vg_write(struct volume_group *vg)
{ {
struct list *mdah;
struct metadata_area *mda;
struct lv_list *lvl; struct lv_list *lvl;
if (!check_pv_segments(vg)) { if (!check_pv_segments(vg)) {
@ -721,6 +715,23 @@ int vg_write(struct volume_group *vg)
} }
} }
return 1;
}
/*
* After vg_write() returns success,
* caller MUST call either vg_commit() or vg_revert()
*/
int vg_write(struct volume_group *vg)
{
struct list *mdah;
struct metadata_area *mda;
if (!vg_validate(vg)) {
stack;
return 0;
}
if (vg->status & PARTIAL_VG) { if (vg->status & PARTIAL_VG) {
log_error("Cannot change metadata for partial volume group %s", log_error("Cannot change metadata for partial volume group %s",
vg->name); vg->name);

2
lib/metadata/metadata.h
View File

@ -391,6 +391,7 @@ struct format_handler {
/* /*
* Utility functions * Utility functions
*/ */
int vg_validate(struct volume_group *vg);
int vg_write(struct volume_group *vg); int vg_write(struct volume_group *vg);
int vg_commit(struct volume_group *vg); int vg_commit(struct volume_group *vg);
int vg_revert(struct volume_group *vg); int vg_revert(struct volume_group *vg);
@ -538,7 +539,6 @@ int vg_add_snapshot(struct format_instance *fid, const char *name,
int vg_remove_snapshot(struct logical_volume *cow); int vg_remove_snapshot(struct logical_volume *cow);
/* /*
* Mirroring functions * Mirroring functions
*/ */

15
lib/metadata/pv_manip.c
View File

@ -100,6 +100,11 @@ static int _pv_split_segment(struct physical_volume *pv, struct pv_segment *peg,
list_add_h(&peg->list, &peg_new->list); list_add_h(&peg->list, &peg_new->list);
if (peg->lvseg) {
peg->pv->pe_alloc_count -= peg_new->len;
peg->lvseg->lv->vg->free_count += peg_new->len;
}
return 1; return 1;
} }
@ -170,10 +175,16 @@ struct pv_segment *assign_peg_to_lvseg(struct physical_volume *pv,
int release_pv_segment(struct pv_segment *peg, uint32_t area_reduction) int release_pv_segment(struct pv_segment *peg, uint32_t area_reduction)
{ {
peg->pv->pe_alloc_count -= area_reduction; if (!peg->lvseg) {
peg->lvseg->lv->vg->free_count += area_reduction; log_error("release_pv_segment with unallocated segment: "
"%s PE %" PRIu32, dev_name(peg->pv->dev), peg->pe);
return 0;
}
if (peg->lvseg->area_len == area_reduction) { if (peg->lvseg->area_len == area_reduction) {
peg->pv->pe_alloc_count -= area_reduction;
peg->lvseg->lv->vg->free_count += area_reduction;
peg->lvseg = NULL; peg->lvseg = NULL;
peg->lv_area = 0; peg->lv_area = 0;