From a2026546ba7e757714fd2f5bbf5b956827444dd6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Tue, 3 Apr 2018 10:13:26 -0400 Subject: [PATCH] Fix: cmd_rotate_set_schedule returns positive error codes MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- src/bin/lttng-sessiond/main.c | 4 +--- src/lib/lttng-ctl/rotate.c | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c index 4c885d7b7..db92191c8 100644 --- a/src/bin/lttng-sessiond/main.c +++ b/src/bin/lttng-sessiond/main.c @@ -4204,12 +4204,10 @@ error_add_context: cmd_ctx->lsm->u.rotate_setup.timer_us, cmd_ctx->lsm->u.rotate_setup.size, notification_thread_handle); - if (ret < 0) { - ret = -ret; + if (ret != LTTNG_OK) { goto error; } - ret = LTTNG_OK; break; } case LTTNG_ROTATION_SCHEDULE_GET_TIMER_PERIOD: diff --git a/src/lib/lttng-ctl/rotate.c b/src/lib/lttng-ctl/rotate.c index d9907cc67..4b7c2f916 100644 --- a/src/lib/lttng-ctl/rotate.c +++ b/src/lib/lttng-ctl/rotate.c @@ -332,7 +332,6 @@ int lttng_rotation_set_schedule( lsm.u.rotate_setup.size = attr->size; ret = lttng_ctl_ask_sessiond(&lsm, NULL); - end: return ret; } -- 2.34.1