summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Wysochanski <dwysocha@redhat.com>2010-04-13 17:26:20 +0000
committerDave Wysochanski <dwysocha@redhat.com>2010-04-13 17:26:20 +0000
commit11647ad01c7300823a8a5f27d60d2ee49b8e79a0 (patch)
tree0cfe9091a03ac2a3961a92942fcb865d3c688469
parent0adfbfd5ea1293efb3d5876628419e31bf96763b (diff)
downloadlvm2-11647ad01c7300823a8a5f27d60d2ee49b8e79a0.tar.gz
lvm2-11647ad01c7300823a8a5f27d60d2ee49b8e79a0.tar.xz
lvm2-11647ad01c7300823a8a5f27d60d2ee49b8e79a0.zip
Use del_pvl_from_vgs() in vgreduce paths.
Somehow these got missed in earlier patches. Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
-rw-r--r--lib/metadata/metadata.c3
-rw-r--r--tools/vgreduce.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
index a7b9e18c..8e2faad9 100644
--- a/lib/metadata/metadata.c
+++ b/lib/metadata/metadata.c
@@ -667,12 +667,11 @@ int vg_reduce(struct volume_group *vg, char *pv_name)
goto bad;
}
- vg->pv_count--;
vg->free_count -= pv_pe_count(pv) - pv_pe_alloc_count(pv);
vg->extent_count -= pv_pe_count(pv);
+ del_pvl_from_vgs(vg, pvl);
/* add pv to the remove_pvs list */
- dm_list_del(&pvl->list);
dm_list_add(&vg->removed_pvs, &pvl->list);
return 1;
diff --git a/tools/vgreduce.c b/tools/vgreduce.c
index 287db411..0cbe4b04 100644
--- a/tools/vgreduce.c
+++ b/tools/vgreduce.c
@@ -407,7 +407,7 @@ static int _vgreduce_single(struct cmd_context *cmd, struct volume_group *vg,
log_verbose("Removing \"%s\" from volume group \"%s\"", name, vg->name);
if (pvl)
- dm_list_del(&pvl->list);
+ del_pvl_from_vgs(vg, pvl);
pv->vg_name = vg->fid->fmt->orphan_vg_name;
pv->status = ALLOCATABLE_PV;
@@ -417,7 +417,6 @@ static int _vgreduce_single(struct cmd_context *cmd, struct volume_group *vg,
goto bad;
}
- vg->pv_count--;
vg->free_count -= pv_pe_count(pv) - pv_pe_alloc_count(pv);
vg->extent_count -= pv_pe_count(pv);