shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

debug: lvconvert add missing display_lvname

Browse Source 
Add missing display_lvname in _lvconvert_merge_thin_snapshot().

Also when we detect missing origin, report Internal error,
which would likely be the primary fault here
(and avoid dereft of NULL origin as noticed by Coverity).
This commit is contained in:
Zdenek Kabelac 2015-11-13 23:38:34 +01:00
parent 0f4d96f1bd
commit 8ebf2b0611
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/lvconvert.c
View File

@ -2238,8 +2238,8 @@ static int _lvconvert_merge_thin_snapshot(struct cmd_context *cmd,
struct logical_volume *origin = snap_seg->origin;
if (!origin) {
log_error("\"%s\" is not a mergeable logical volume.",
lv->name);
log_error("%s is not a mergeable logical volume.",
display_lvname(lv));
return 0;
}
@ -2251,9 +2251,12 @@ static int _lvconvert_merge_thin_snapshot(struct cmd_context *cmd,
}
if (lv_is_external_origin(origin)) {
origin = origin_from_cow(lv);
log_error("%s is read-only external origin %s.",
display_lvname(lv), display_lvname(origin));
if (!(origin = origin_from_cow(lv)))
log_error(INTERNAL_ERROR "%s is missing origin.",
display_lvname(lv));
else
log_error("%s is read-only external origin %s.",
display_lvname(lv), display_lvname(origin));
return 0;
}