diff options
author | Zdenek Kabelac <zkabelac@redhat.com> | 2014-10-04 17:17:49 +0200 |
---|---|---|
committer | Zdenek Kabelac <zkabelac@redhat.com> | 2014-10-06 15:23:07 +0200 |
commit | 73c74d582c27400f8cad939a52503e3721c0e153 (patch) | |
tree | e93dc7990a1411fa4f4e52c680c0aa2ac82c9ab2 | |
parent | 8d272ba0ada6deae264e44705a4ce3b7ece93cd0 (diff) | |
download | lvm2-73c74d582c27400f8cad939a52503e3721c0e153.tar.gz |
cleanup: lvconvert use standard function exit
Use 1|0 inside _lvconvert_splitsnapshot to match rest of code.
-rw-r--r-- | tools/lvconvert.c | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/tools/lvconvert.c b/tools/lvconvert.c index 4bf43069c..8f2556128 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -1962,45 +1962,45 @@ static int _lvconvert_splitsnapshot(struct cmd_context *cmd, struct logical_volu if (!lv_is_cow(cow)) { log_error("%s/%s is not a snapshot.", vg->name, cow->name); - return ECMD_FAILED; + return 0; } if (lv_is_origin(cow) || lv_is_external_origin(cow)) { log_error("Unable to split LV %s/%s that is a snapshot origin.", vg->name, cow->name); - return ECMD_FAILED; + return 0; } if (lv_is_merging_cow(cow)) { log_error("Unable to split off snapshot %s/%s being merged into its origin.", vg->name, cow->name); - return ECMD_FAILED; + return 0; } if (lv_is_virtual_origin(origin_from_cow(cow))) { log_error("Unable to split off snapshot %s/%s with virtual origin.", vg->name, cow->name); - return ECMD_FAILED; + return 0; } if (lv_is_thin_pool(cow) || lv_is_pool_metadata_spare(cow)) { log_error("Unable to split off LV %s/%s needed by thin volume(s).", vg->name, cow->name); - return ECMD_FAILED; + return 0; } if (!(vg->fid->fmt->features & FMT_MDAS)) { log_error("Unable to split off snapshot %s/%s using old LVM1-style metadata.", vg->name, cow->name); - return ECMD_FAILED; + return 0; } if (!vg_check_status(vg, LVM_WRITE)) - return_ECMD_FAILED; + return_0; if (lv_is_pvmove(cow) || lv_is_mirror_type(cow) || lv_is_raid_type(cow) || lv_is_thin_type(cow)) { log_error("LV %s/%s type is unsupported with --splitsnapshot.", vg->name, cow->name); - return ECMD_FAILED; + return 0; } if (lv_is_active_locally(cow)) { if (!lv_check_not_in_use(cow)) - return_ECMD_FAILED; + return_0; if ((lp->force == PROMPT) && !lp->yes && lv_is_visible(cow) && @@ -2008,24 +2008,24 @@ static int _lvconvert_splitsnapshot(struct cmd_context *cmd, struct logical_volu if (yes_no_prompt("Do you really want to split off active " "logical volume %s? [y/n]: ", cow->name) == 'n') { log_error("Logical volume %s not split.", cow->name); - return ECMD_FAILED; + return 0; } } } if (!archive(vg)) - return_ECMD_FAILED; + return_0; log_verbose("Splitting snapshot %s/%s from its origin.", vg->name, cow->name); if (!vg_remove_snapshot(cow)) - return_ECMD_FAILED; + return_0; backup(vg); log_print_unless_silent("Logical Volume %s/%s split from its origin.", vg->name, cow->name); - return ECMD_PROCESSED; + return 1; } @@ -3239,8 +3239,11 @@ static int _lvconvert_single(struct cmd_context *cmd, struct logical_volume *lv, return ECMD_FAILED; } - if (lp->splitsnapshot) - return _lvconvert_splitsnapshot(cmd, lv, lp); + if (lp->splitsnapshot) { + if (!_lvconvert_splitsnapshot(cmd, lv, lp)) + return_ECMD_FAILED; + return ECMD_PROCESSED; + } if (lp->splitcache) { if (!_lvconvert_splitcache(cmd, lv, lp)) |