From 21e2ab0e67932365fe08ec41240ed22a6766776f Mon Sep 17 00:00:00 2001 From: Alasdair Kergon Date: Mon, 26 Apr 2010 18:31:58 +0000 Subject: [PATCH] Fix lvconvert error message when existing mirrored LV is not found. --- WHATS_NEW | 1 + tools/lvconvert.c | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 199d3da2f..d0844e411 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.64 - ================================= + Fix lvconvert error message when existing mirrored LV is not found. Disallow the direct removal of a merging snapshot. Set appropriate udev flags for reserved LVs. Don't preload the origin when removing a snapshot whose merge is pending. diff --git a/tools/lvconvert.c b/tools/lvconvert.c index 4c766e7ba..c280d1abf 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -1533,12 +1533,11 @@ static struct logical_volume *get_vg_lock_and_logical_volume(struct cmd_context vg = _get_lvconvert_vg(cmd, vg_name, NULL); if (vg_read_error(vg)) { vg_release(vg); - log_error("ABORTING: Can't reread VG for %s", vg_name); - return NULL; + return_NULL; } if (!(lv = _get_lvconvert_lv(cmd, vg, lv_name, NULL, 0))) { - log_error("ABORTING: Can't find LV %s in VG %s", lv_name, vg_name); + log_error("Can't find LV %s in VG %s", lv_name, vg_name); unlock_and_release_vg(cmd, vg, vg_name); return NULL; } @@ -1616,8 +1615,10 @@ static int lvconvert_merge_single(struct cmd_context *cmd, struct logical_volume vg_name = lv->vg->name; unlock_vg(cmd, vg_name); refreshed_lv = get_vg_lock_and_logical_volume(cmd, vg_name, lv->name); - if (!refreshed_lv) + if (!refreshed_lv) { + log_error("ABORTING: Can't reread LV %s/%s", vg_name, lv->name); return ECMD_FAILED; + } lp->lv_to_poll = refreshed_lv; ret = _lvconvert_single(cmd, refreshed_lv, lp);