summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2012-02-23 22:24:47 +0000
committerZdenek Kabelac <zkabelac@redhat.com>2012-02-23 22:24:47 +0000
commit219e040062ea6eaf50f832db409dfe2807376c52 (patch)
tree7bcfb56e17dfd697510f2abee349f9b94c87fb78
parentba337a5f3e0576173e19e6d503aa100fa5fad01a (diff)
downloadlvm2-219e040062ea6eaf50f832db409dfe2807376c52.tar.gz
lvm2-219e040062ea6eaf50f832db409dfe2807376c52.tar.xz
lvm2-219e040062ea6eaf50f832db409dfe2807376c52.zip
Drop backtrace after log_error
Just a minor change to not give backtrace when log_error has been just reported.
-rw-r--r--lib/cache/lvmetad.c2
-rw-r--r--lib/metadata/lv_manip.c2
-rw-r--r--lib/metadata/mirror.c8
-rw-r--r--lib/mirror/mirrored.c10
4 files changed, 11 insertions, 11 deletions
diff --git a/lib/cache/lvmetad.c b/lib/cache/lvmetad.c
index f8257651..1743d393 100644
--- a/lib/cache/lvmetad.c
+++ b/lib/cache/lvmetad.c
@@ -245,7 +245,7 @@ int lvmetad_vg_update(struct volume_group *vg)
* request. */
if (!export_vg_to_buffer(vg, &buf)) {
log_error("Could not format VG metadata.");
- return_0;
+ return 0;
}
reply = daemon_send_simple(_lvmetad, "vg_update", "vgname = %s", vg->name,
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index fef26451..52964229 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -2331,7 +2331,7 @@ int lv_add_mirror_lvs(struct logical_volume *lv,
if (dm_list_size(&lv->segments) != 1 || seg_type(seg, 0) != AREA_LV) {
log_error("Mirror layer must be inserted before adding mirrors");
- return_0;
+ return 0;
}
mirror_segtype = get_segtype_from_string(lv->vg->cmd, "mirror");
diff --git a/lib/metadata/mirror.c b/lib/metadata/mirror.c
index 2167ed64..45295049 100644
--- a/lib/metadata/mirror.c
+++ b/lib/metadata/mirror.c
@@ -873,7 +873,7 @@ static int _remove_mirror_images(struct logical_volume *lv,
if ((s == 0) && !_mirrored_lv_in_sync(lv) &&
!(lv->status & PARTIAL_LV)) {
log_error("Unable to remove primary mirror image while mirror is not in-sync");
- return_0;
+ return 0;
}
if (!shift_mirror_images(mirrored_seg, s))
return_0;
@@ -1015,7 +1015,7 @@ static int _remove_mirror_images(struct logical_volume *lv,
if (!resume_lv(detached_log_lv->vg->cmd, detached_log_lv)) {
log_error("Failed to resume %s",
detached_log_lv->name);
- return_0;
+ return 0;
}
}
@@ -1091,7 +1091,7 @@ static int _remove_mirror_images(struct logical_volume *lv,
/* As a result, unnecessary sync may run after
* collapsing. But safe.*/
log_error("Failed to initialize log device");
- return_0;
+ return 0;
}
}
@@ -2136,7 +2136,7 @@ int lv_split_mirror_images(struct logical_volume *lv, const char *split_name,
/* Can't split a mirror that is not in-sync... unless force? */
if (!_mirrored_lv_in_sync(lv)) {
log_error("Unable to split mirror that is not in-sync.");
- return_0;
+ return 0;
}
/*
diff --git a/lib/mirror/mirrored.c b/lib/mirror/mirrored.c
index ca327ab1..27230e23 100644
--- a/lib/mirror/mirrored.c
+++ b/lib/mirror/mirrored.c
@@ -251,7 +251,7 @@ static int _mirrored_transient_status(struct lv_segment *seg, char *params)
if (num_devs > DEFAULT_MIRROR_MAX_IMAGES || num_devs < 0) {
log_error("Unexpectedly many (%d) mirror images in %s.",
num_devs, lv->name);
- return_0;
+ return 0;
}
args = alloca((num_devs + 5) * sizeof(char *));
@@ -265,7 +265,7 @@ static int _mirrored_transient_status(struct lv_segment *seg, char *params)
if (log_argc > 16 || log_argc < 0) {
log_error("Unexpectedly many (%d) log arguments in %s.",
log_argc, lv->name);
- return_0;
+ return 0;
}
log_args = alloca(log_argc * sizeof(char *));
@@ -277,7 +277,7 @@ static int _mirrored_transient_status(struct lv_segment *seg, char *params)
if (num_devs != seg->area_count) {
log_error("Active mirror has a wrong number of mirror images!");
log_error("Metadata says %d, kernel says %d.", seg->area_count, num_devs);
- return_0;
+ return 0;
}
if (!strcmp(log_args[0], "disk")) {
@@ -293,7 +293,7 @@ static int _mirrored_transient_status(struct lv_segment *seg, char *params)
if (strcmp(buf, log_args[1])) {
log_error("Mirror log mismatch. Metadata says %s, kernel says %s.",
buf, log_args[1]);
- return_0;
+ return 0;
}
log_very_verbose("Status of log (%s): %s", buf, log_args[2]);
if (log_args[2][0] != 'A') {
@@ -327,7 +327,7 @@ static int _mirrored_transient_status(struct lv_segment *seg, char *params)
for (i = 0; i < num_devs; ++i) {
if (!images[i]) {
log_error("Failed to find image %d (%s).", i, args[i]);
- return_0;
+ return 0;
}
log_very_verbose("Status of image %d: %c", i, status[i]);
if (status[i] != 'A') {