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

cleanup: update error messages

Browse Source 
Correct printed lv names in error messages
and add missing trace for return.
This commit is contained in:
Zdenek Kabelac 2017-11-21 15:33:29 +01:00
parent b0398f42ad
commit 7bffbe0e2f
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/lvconvert.c
View File

@ -2328,15 +2328,15 @@ static int _lvconvert_thin_pool_repair(struct cmd_context *cmd,
deactivate_mlv: deactivate_mlv:
if (!deactivate_lv(cmd, mlv)) { if (!deactivate_lv(cmd, mlv)) {
log_error("Cannot deactivate thin pool metadata volume %s.", log_error("Cannot deactivate thin pool metadata volume %s.",
mlv->name); display_lvname(mlv));
return 0; ret = 0;
} }
deactivate_pmslv: deactivate_pmslv:
if (!deactivate_lv(cmd, pmslv)) { if (!deactivate_lv(cmd, pmslv)) {
log_error("Cannot deactivate thin pool metadata volume %s.", log_error("Cannot deactivate pool metadata spare volume %s.",
mlv->name); display_lvname(pmslv));
return 0; ret = 0;
} }
if (!ret) if (!ret)
@ -2500,15 +2500,15 @@ static int _lvconvert_cache_repair(struct cmd_context *cmd,
deactivate_mlv: deactivate_mlv:
if (!deactivate_lv(cmd, mlv)) { if (!deactivate_lv(cmd, mlv)) {
log_error("Cannot deactivate pool metadata volume %s.", log_error("Cannot deactivate pool metadata volume %s.",
mlv->name); display_lvname(mlv));
return 0; ret = 0;
} }
deactivate_pmslv: deactivate_pmslv:
if (!deactivate_lv(cmd, pmslv)) { if (!deactivate_lv(cmd, pmslv)) {
log_error("Cannot deactivate pool metadata spare volume %s.", log_error("Cannot deactivate pool metadata spare volume %s.",
mlv->name); display_lvname(pmslv));
return 0; ret = 0;
} }
if (!ret) if (!ret)

2
tools/pvmove_poll.c
View File

@ -64,7 +64,7 @@ static int _detach_pvmove_mirror(struct cmd_context *cmd,
if (!lv_remove_mirrors(cmd, lv_mirr, 1, 0, _is_pvmove_image_removable, &mimage_to_remove, PVMOVE) || if (!lv_remove_mirrors(cmd, lv_mirr, 1, 0, _is_pvmove_image_removable, &mimage_to_remove, PVMOVE) ||
!remove_layers_for_segments_all(cmd, lv_mirr, PVMOVE, !remove_layers_for_segments_all(cmd, lv_mirr, PVMOVE,
&lvs_completed)) { &lvs_completed)) {
return 0; return_0;
} }
dm_list_iterate_items(lvl, &lvs_completed) dm_list_iterate_items(lvl, &lvs_completed)