From ba3851fda658d509525d7cdd2cd54abe3a49f606 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Wed, 4 Nov 2009 14:47:27 +0000 Subject: [PATCH] Fix lvcreate processing of %PVS argument. - fix missing unlocking of VG lvcreate -l 100%PVS -n lv1 vg_test Please specify physical volume(s) with %PVS Internal error: Volume Group vg_test was not unlocked - if no PVS specified, use all available Fix segfault if %PVS in lvresize without PVs list. --- WHATS_NEW | 1 + tools/lvcreate.c | 17 ++++++++--------- tools/lvresize.c | 7 +++++-- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 668b4989f..b16bcb4fe 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.55 - =================================== + Fix lvcreate and lvresize processing of %PVS argument. Tidy some uses of arg_count and introduce arg_is_set. Export outnl and indent functions for modules. Flush stdout after yes/no prompt. diff --git a/tools/lvcreate.c b/tools/lvcreate.c index c677d6bb9..f250f371d 100644 --- a/tools/lvcreate.c +++ b/tools/lvcreate.c @@ -160,13 +160,12 @@ static int _update_extents_params(struct volume_group *vg, lp->extents = lp->extents * vg->free_count / 100; break; case PERCENT_PVS: - if (!lcp->pv_count) { - log_error("Please specify physical volume(s) " - "with %%PVS"); - return 0; + if (!lcp->pv_count) + lp->extents = lp->extents * vg->extent_count / 100; + else { + pv_extent_count = pv_list_extents_free(lp->pvh); + lp->extents = lp->extents * pv_extent_count / 100; } - pv_extent_count = pv_list_extents_free(lp->pvh); - lp->extents = lp->extents * pv_extent_count / 100; break; case PERCENT_LV: log_error("Please express size as %%VG, %%PVS, or " @@ -584,15 +583,15 @@ int lvcreate(struct cmd_context *cmd, int argc, char **argv) } if (!_update_extents_params(vg, &lp, &lcp)) { - stack; - return ECMD_FAILED; + r = ECMD_FAILED; + goto_out; } if (!lv_create_single(vg, &lp)) { stack; r = ECMD_FAILED; } - +out: unlock_and_release_vg(cmd, vg, lp.vg_name); return r; } diff --git a/tools/lvresize.c b/tools/lvresize.c index 2a4177954..3b3a2eb9e 100644 --- a/tools/lvresize.c +++ b/tools/lvresize.c @@ -367,8 +367,11 @@ static int _lvresize(struct cmd_context *cmd, struct volume_group *vg, lp->extents = lp->extents * lv->le_count / 100; break; case PERCENT_PVS: - pv_extent_count = pv_list_extents_free(pvh); - lp->extents = lp->extents * pv_extent_count / 100; + if (lp->argc) { + pv_extent_count = pv_list_extents_free(pvh); + lp->extents = lp->extents * pv_extent_count / 100; + } else + lp->extents = lp->extents * vg->extent_count / 100; break; case PERCENT_NONE: break; -- 2.43.5