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

Thin error messages clenaup and some indent

Browse Source
This commit is contained in:
Zdenek Kabelac 2011-10-28 20:19:26 +00:00
parent dd3bb2bac3
commit c590a9cdbc
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/metadata/lv_manip.c
View File

@ -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)) { if (lv_is_thin_pool(lv) && dm_list_size(&lv->segs_using_this_lv)) {
/* remove thin LVs first */ /* remove thin LVs first */
if ((force == PROMPT) && if ((force == PROMPT) &&
yes_no_prompt("Do you really want to remove all thin volumes when removing " yes_no_prompt("Do you really want to remove all thin volumes when removing"
"pool logical volume %s? [y/n]: ", lv->name) == 'n') { " pool logical volume %s? [y/n]: ", lv->name) == 'n') {
log_error("Logical volume %s not removed", lv->name); log_error("Logical volume %s not removed.", lv->name);
return 0; return 0;
} }
dm_list_iterate_safe(snh, snht, &lv->segs_using_this_lv) { 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) && if (!seg_is_thin_pool(lp) &&
!(lp->segtype = get_segtype_from_string(vg->cmd, "thin_pool"))) !(lp->segtype = get_segtype_from_string(vg->cmd, "thin_pool")))
return_0; return_0;
if (!(lv = _lv_create_an_lv(vg, lp, lp->pool))) if (!(lv = _lv_create_an_lv(vg, lp, lp->pool)))
return_0; return_0;
@ -4316,7 +4316,7 @@ int lv_create_single(struct volume_group *vg,
goto out; goto out;
lp->pool = lv->name; lp->pool = lv->name;
if (!(lp->segtype = get_segtype_from_string(vg->cmd, "thin"))) if (!(lp->segtype = get_segtype_from_string(vg->cmd, "thin")))
return_0; return_0;
} }

6
libdm/libdm-deptree.c
View File

@ -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, &params); dm_get_next_target(dmt, NULL, &start, &length, &type, &params);
if (type && (strcmp(type, "thin-pool") != 0)) { if (type && (strcmp(type, "thin-pool") != 0)) {
log_error(INTERNAL_ERROR log_error("Expected thin-pool target for %d:%d and got %s.",
"Expected thin-pool target for %d:%d and got %s.",
dnode->info.major, dnode->info.minor, type); dnode->info.major, dnode->info.minor, type);
goto out; goto out;
} }
if (!params || (sscanf(params, "%" PRIu64, transaction_id) != 1)) { if (!params || (sscanf(params, "%" PRIu64, transaction_id) != 1)) {
log_error(INTERNAL_ERROR log_error("Failed to parse transaction_id from %s.", params);
"Failed to parse transaction_id from %s.", params);
goto out; goto out;
} }