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

Fix lvconvert error message when existing mirrored LV is not found.

Browse Source
This commit is contained in:
Alasdair Kergon 2010-04-26 18:31:58 +00:00
parent 4ed099bafa
commit 21e2ab0e67
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.64 - Version 2.02.64 -
================================= =================================
Fix lvconvert error message when existing mirrored LV is not found.
Disallow the direct removal of a merging snapshot. Disallow the direct removal of a merging snapshot.
Set appropriate udev flags for reserved LVs. Set appropriate udev flags for reserved LVs.
Don't preload the origin when removing a snapshot whose merge is pending. Don't preload the origin when removing a snapshot whose merge is pending.

9
tools/lvconvert.c
View File

@ -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); vg = _get_lvconvert_vg(cmd, vg_name, NULL);
if (vg_read_error(vg)) { if (vg_read_error(vg)) {
vg_release(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))) { 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); unlock_and_release_vg(cmd, vg, vg_name);
return NULL; return NULL;
} }
@ -1616,8 +1615,10 @@ static int lvconvert_merge_single(struct cmd_context *cmd, struct logical_volume
vg_name = lv->vg->name; vg_name = lv->vg->name;
unlock_vg(cmd, vg_name); unlock_vg(cmd, vg_name);
refreshed_lv = get_vg_lock_and_logical_volume(cmd, vg_name, lv->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; return ECMD_FAILED;
}
lp->lv_to_poll = refreshed_lv; lp->lv_to_poll = refreshed_lv;
ret = _lvconvert_single(cmd, refreshed_lv, lp); ret = _lvconvert_single(cmd, refreshed_lv, lp);