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

lvconvert: fix error value

Browse Source 
Seems some error path where not converted to 'new' ECMD return value.
Fix them to always 'goto out'.
Also drop unneeded   'ret = 0' when ret already is 0.
This commit is contained in:
Zdenek Kabelac 2016-10-11 11:59:43 +02:00
parent 20e74313cd
commit 1186cf2ad4
2 changed files with 5 additions and 8 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.167 - Version 2.02.167 -
====================================== ======================================
Fix a few unconverted return code values for some lvconvert error path.
Disable lvconvert of thin pool to raid while active. Disable lvconvert of thin pool to raid while active.
Disable systemd service start rate limiting for lvm2-pvscan@.service. Disable systemd service start rate limiting for lvm2-pvscan@.service.

12
tools/lvconvert.c
View File

@ -4446,13 +4446,11 @@ static int _lvconvert(struct cmd_context *cmd, struct logical_volume *lv,
if (lv_is_locked(lv)) { if (lv_is_locked(lv)) {
log_error("Cannot convert locked LV %s.", display_lvname(lv)); log_error("Cannot convert locked LV %s.", display_lvname(lv));
ret = 0;
goto out; goto out;
} }
if (lv_is_pvmove(lv)) { if (lv_is_pvmove(lv)) {
log_error("Cannot convert pvmove LV %s.", display_lvname(lv)); log_error("Cannot convert pvmove LV %s.", display_lvname(lv));
ret = 0;
goto out; goto out;
} }
@ -4471,7 +4469,6 @@ static int _lvconvert(struct cmd_context *cmd, struct logical_volume *lv,
!lv_is_mirrored(lv) && !lv_is_mirrored(lv) &&
!lv_is_raid(lv)) { !lv_is_raid(lv)) {
log_error("Cannot convert internal LV %s.", display_lvname(lv)); log_error("Cannot convert internal LV %s.", display_lvname(lv));
ret = 0;
goto out; goto out;
} }
} }
@ -4480,12 +4477,12 @@ static int _lvconvert(struct cmd_context *cmd, struct logical_volume *lv,
if (!*lp->type_str) if (!*lp->type_str)
lp->segtype = seg->segtype; lp->segtype = seg->segtype;
else if (!(lp->segtype = get_segtype_from_string(cmd, lp->type_str))) else if (!(lp->segtype = get_segtype_from_string(cmd, lp->type_str)))
return_0; goto_out;
if (!strcmp(lp->type_str, SEG_TYPE_NAME_MIRROR)) { if (!strcmp(lp->type_str, SEG_TYPE_NAME_MIRROR)) {
if (!lp->mirrors_supplied && !seg_is_raid1(seg)) { if (!lp->mirrors_supplied && !seg_is_raid1(seg)) {
log_error("Conversions to --type mirror require -m/--mirrors"); log_error("Conversions to --type mirror require -m/--mirrors");
return 0; goto out;
} }
} }
@ -4494,7 +4491,7 @@ static int _lvconvert(struct cmd_context *cmd, struct logical_volume *lv,
!lp->segtype->ops->target_present(cmd, NULL, &lp->target_attr)) { !lp->segtype->ops->target_present(cmd, NULL, &lp->target_attr)) {
log_error("%s: Required device-mapper target(s) not " log_error("%s: Required device-mapper target(s) not "
"detected in your kernel.", lp->segtype->name); "detected in your kernel.", lp->segtype->name);
return 0; goto out;
} }
/* Process striping parameters */ /* Process striping parameters */
@ -4503,7 +4500,7 @@ static int _lvconvert(struct cmd_context *cmd, struct logical_volume *lv,
_striped_type_requested(lp->type_str) || lp->repair || lp->mirrorlog || lp->corelog) { _striped_type_requested(lp->type_str) || lp->repair || lp->mirrorlog || lp->corelog) {
/* FIXME Handle +/- adjustments too? */ /* FIXME Handle +/- adjustments too? */
if (!get_stripe_params(cmd, lp->segtype, &lp->stripes, &lp->stripe_size, &lp->stripes_supplied, &lp->stripe_size_supplied)) if (!get_stripe_params(cmd, lp->segtype, &lp->stripes, &lp->stripe_size, &lp->stripes_supplied, &lp->stripe_size_supplied))
return_0; goto_out;
if (_raid0_type_requested(lp->type_str) || _striped_type_requested(lp->type_str)) if (_raid0_type_requested(lp->type_str) || _striped_type_requested(lp->type_str))
/* FIXME Shouldn't need to override get_stripe_params which defaults to 1 stripe (i.e. linear)! */ /* FIXME Shouldn't need to override get_stripe_params which defaults to 1 stripe (i.e. linear)! */
@ -4569,7 +4566,6 @@ static int _lvconvert(struct cmd_context *cmd, struct logical_volume *lv,
* reach here, but this covers anything that was missed. * reach here, but this covers anything that was missed.
*/ */
log_error("Cannot convert LV %s.", display_lvname(lv)); log_error("Cannot convert LV %s.", display_lvname(lv));
ret = 0;
out: out:
return ret ? ECMD_PROCESSED : ECMD_FAILED; return ret ? ECMD_PROCESSED : ECMD_FAILED;