From c590a9cdbc5fdd56663fa7047b353415d78df626 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Fri, 28 Oct 2011 20:19:26 +0000 Subject: [PATCH] Thin error messages clenaup and some indent --- lib/metadata/lv_manip.c | 10 +++++----- libdm/libdm-deptree.c | 6 ++---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index adfe95c8d..1c00d6c9a 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -3215,9 +3215,9 @@ int lv_remove_with_dependencies(struct cmd_context *cmd, struct logical_volume * if (lv_is_thin_pool(lv) && dm_list_size(&lv->segs_using_this_lv)) { /* remove thin LVs first */ if ((force == PROMPT) && - yes_no_prompt("Do you really want to remove all thin volumes when removing " - "pool logical volume %s? [y/n]: ", lv->name) == 'n') { - log_error("Logical volume %s not removed", lv->name); + yes_no_prompt("Do you really want to remove all thin volumes when removing" + " pool logical volume %s? [y/n]: ", lv->name) == 'n') { + log_error("Logical volume %s not removed.", lv->name); return 0; } dm_list_iterate_safe(snh, snht, &lv->segs_using_this_lv) { @@ -4308,7 +4308,7 @@ int lv_create_single(struct volume_group *vg, if (!seg_is_thin_pool(lp) && !(lp->segtype = get_segtype_from_string(vg->cmd, "thin_pool"))) return_0; - + if (!(lv = _lv_create_an_lv(vg, lp, lp->pool))) return_0; @@ -4316,7 +4316,7 @@ int lv_create_single(struct volume_group *vg, goto out; lp->pool = lv->name; - + if (!(lp->segtype = get_segtype_from_string(vg->cmd, "thin"))) return_0; } diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index 59f78c9fe..53ce550b0 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -1241,15 +1241,13 @@ static int _thin_pool_status_transaction_id(struct dm_tree_node *dnode, uint64_t dm_get_next_target(dmt, NULL, &start, &length, &type, ¶ms); if (type && (strcmp(type, "thin-pool") != 0)) { - log_error(INTERNAL_ERROR - "Expected thin-pool target for %d:%d and got %s.", + log_error("Expected thin-pool target for %d:%d and got %s.", dnode->info.major, dnode->info.minor, type); goto out; } if (!params || (sscanf(params, "%" PRIu64, transaction_id) != 1)) { - log_error(INTERNAL_ERROR - "Failed to parse transaction_id from %s.", params); + log_error("Failed to parse transaction_id from %s.", params); goto out; } -- 2.43.5