1
0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-22 17:35:59 +03:00

Fix locking for mimage removal.

This commit is contained in:
Alasdair Kergon 2006-07-20 20:37:10 +00:00
parent b813f533f8
commit 8b0d546f4c
2 changed files with 17 additions and 0 deletions

View File

@ -1,5 +1,6 @@
Version 2.02.08 - Version 2.02.08 -
================================ ================================
Fix locking for mimage removal.
Fix clvmd_init_rhel4 'status' exit code. Fix clvmd_init_rhel4 'status' exit code.
Version 2.02.07 - 17th July 2006 Version 2.02.07 - 17th July 2006

View File

@ -199,6 +199,12 @@ int remove_mirror_images(struct lv_segment *mirrored_seg, uint32_t num_mirrors,
/* Delete the 'orphan' LVs */ /* Delete the 'orphan' LVs */
for (m = num_mirrors; m < old_area_count; m++) { for (m = num_mirrors; m < old_area_count; m++) {
/* LV is now independent of the mirror so must acquire lock. */
if (!activate_lv(mirrored_seg->lv->vg->cmd, seg_lv(mirrored_seg, m))) {
stack;
return 0;
}
if (!deactivate_lv(mirrored_seg->lv->vg->cmd, seg_lv(mirrored_seg, m))) { if (!deactivate_lv(mirrored_seg->lv->vg->cmd, seg_lv(mirrored_seg, m))) {
stack; stack;
return 0; return 0;
@ -211,6 +217,11 @@ int remove_mirror_images(struct lv_segment *mirrored_seg, uint32_t num_mirrors,
} }
if (lv1) { if (lv1) {
if (!activate_lv(mirrored_seg->lv->vg->cmd, lv1)) {
stack;
return 0;
}
if (!deactivate_lv(mirrored_seg->lv->vg->cmd, lv1)) { if (!deactivate_lv(mirrored_seg->lv->vg->cmd, lv1)) {
stack; stack;
return 0; return 0;
@ -223,6 +234,11 @@ int remove_mirror_images(struct lv_segment *mirrored_seg, uint32_t num_mirrors,
} }
if (log_lv) { if (log_lv) {
if (!activate_lv(mirrored_seg->lv->vg->cmd, log_lv)) {
stack;
return 0;
}
if (!deactivate_lv(mirrored_seg->lv->vg->cmd, log_lv)) { if (!deactivate_lv(mirrored_seg->lv->vg->cmd, log_lv)) {
stack; stack;
return 0; return 0;