1
0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00

cleanup: drop backtrace

After log_error/log_warn there is no point to show <backtrace>
in debug log trace from the next code line.
This commit is contained in:
Zdenek Kabelac 2013-05-23 16:17:08 +02:00
parent 58a2e5e2df
commit 3ba3bc0d66
5 changed files with 13 additions and 13 deletions

View File

@ -2019,13 +2019,13 @@ static int _lv_activate(struct cmd_context *cmd, const char *lvid_s,
if ((!lv->vg->cmd->partial_activation) && (lv->status & PARTIAL_LV)) { if ((!lv->vg->cmd->partial_activation) && (lv->status & PARTIAL_LV)) {
log_error("Refusing activation of partial LV %s. Use --partial to override.", log_error("Refusing activation of partial LV %s. Use --partial to override.",
lv->name); lv->name);
goto_out; goto out;
} }
if (lv_has_unknown_segments(lv)) { if (lv_has_unknown_segments(lv)) {
log_error("Refusing activation of LV %s containing " log_error("Refusing activation of LV %s containing "
"an unrecognised segment.", lv->name); "an unrecognised segment.", lv->name);
goto_out; goto out;
} }
if (test_mode()) { if (test_mode()) {

View File

@ -4009,7 +4009,7 @@ static struct volume_group *_vg_lock_and_read(struct cmd_context *cmd, const cha
if (consistent_in && !consistent) { if (consistent_in && !consistent) {
log_error("Volume group \"%s\" inconsistent.", vg_name); log_error("Volume group \"%s\" inconsistent.", vg_name);
failure |= FAILED_INCONSISTENT; failure |= FAILED_INCONSISTENT;
goto_bad; goto bad;
} }
log_error("Volume group \"%s\" not found", vg_name); log_error("Volume group \"%s\" not found", vg_name);
@ -4031,7 +4031,7 @@ static struct volume_group *_vg_lock_and_read(struct cmd_context *cmd, const cha
log_error("Recovery of volume group \"%s\" failed.", log_error("Recovery of volume group \"%s\" failed.",
vg_name); vg_name);
failure |= FAILED_INCONSISTENT; failure |= FAILED_INCONSISTENT;
goto_bad; goto bad;
} }
} }
@ -4045,7 +4045,7 @@ static struct volume_group *_vg_lock_and_read(struct cmd_context *cmd, const cha
log_error("Cannot change VG %s while PVs are missing.", vg->name); log_error("Cannot change VG %s while PVs are missing.", vg->name);
log_error("Consider vgreduce --removemissing."); log_error("Consider vgreduce --removemissing.");
failure |= FAILED_INCONSISTENT; /* FIXME new failure code here? */ failure |= FAILED_INCONSISTENT; /* FIXME new failure code here? */
goto_bad; goto bad;
} }
if (!cmd->handles_unknown_segments && vg_has_unknown_segments(vg) && if (!cmd->handles_unknown_segments && vg_has_unknown_segments(vg) &&
@ -4053,7 +4053,7 @@ static struct volume_group *_vg_lock_and_read(struct cmd_context *cmd, const cha
log_error("Cannot change VG %s with unknown segments in it!", log_error("Cannot change VG %s with unknown segments in it!",
vg->name); vg->name);
failure |= FAILED_INCONSISTENT; /* FIXME new failure code here? */ failure |= FAILED_INCONSISTENT; /* FIXME new failure code here? */
goto_bad; goto bad;
} }
failure |= _vg_bad_status_bits(vg, status_flags); failure |= _vg_bad_status_bits(vg, status_flags);

View File

@ -851,13 +851,13 @@ static int _info_by_dev(uint32_t major, uint32_t minor, int with_open_count,
if (name && !(*name = dm_pool_strdup(mem, dm_task_get_name(dmt)))) { if (name && !(*name = dm_pool_strdup(mem, dm_task_get_name(dmt)))) {
log_error("name pool_strdup failed"); log_error("name pool_strdup failed");
r = 0; r = 0;
goto_out; goto out;
} }
if (uuid && !(*uuid = dm_pool_strdup(mem, dm_task_get_uuid(dmt)))) { if (uuid && !(*uuid = dm_pool_strdup(mem, dm_task_get_uuid(dmt)))) {
log_error("uuid pool_strdup failed"); log_error("uuid pool_strdup failed");
r = 0; r = 0;
goto_out; goto out;
} }
out: out:
@ -1016,13 +1016,13 @@ static int _node_clear_table(struct dm_tree_node *dnode, uint16_t udev_flags)
if (!(dmt = dm_task_create(DM_DEVICE_CLEAR))) { if (!(dmt = dm_task_create(DM_DEVICE_CLEAR))) {
log_error("Table clear dm_task creation failed for %s", name); log_error("Table clear dm_task creation failed for %s", name);
goto_out; goto out;
} }
if (!dm_task_set_major(dmt, info->major) || if (!dm_task_set_major(dmt, info->major) ||
!dm_task_set_minor(dmt, info->minor)) { !dm_task_set_minor(dmt, info->minor)) {
log_error("Failed to set device number for %s table clear", name); log_error("Failed to set device number for %s table clear", name);
goto_out; goto out;
} }
r = dm_task_run(dmt); r = dm_task_run(dmt);

View File

@ -464,7 +464,7 @@ static int _update_metadata(struct cmd_context *cmd, struct volume_group *vg,
* FIXME Run --abort internally here. * FIXME Run --abort internally here.
*/ */
log_error("ABORTING: Temporary pvmove mirror activation failed. Run pvmove --abort."); log_error("ABORTING: Temporary pvmove mirror activation failed. Run pvmove --abort.");
goto_out; goto out;
} }
} }

View File

@ -92,7 +92,7 @@ int vgextend(struct cmd_context *cmd, int argc, char **argv)
} }
if (!fixed) { if (!fixed) {
log_error("No PV has been restored."); log_error("No PV has been restored.");
goto_bad; goto bad;
} }
} else { /* no --restore, normal vgextend */ } else { /* no --restore, normal vgextend */
if (!lock_vol(cmd, VG_ORPHANS, LCK_VG_WRITE)) { if (!lock_vol(cmd, VG_ORPHANS, LCK_VG_WRITE)) {
@ -108,7 +108,7 @@ int vgextend(struct cmd_context *cmd, int argc, char **argv)
"of VG %s metadata? [y/n]: ", "of VG %s metadata? [y/n]: ",
vg_name) == 'n') { vg_name) == 'n') {
log_error("Volume group %s not changed", vg_name); log_error("Volume group %s not changed", vg_name);
goto_bad; goto bad;
} }
/* extend vg */ /* extend vg */