X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=kconsumerd%2Fkconsumerd.c;h=c51e4adff535f56fc039459f41693f6e1dd6af30;hb=b082db07f0c522527fc95fc97f3e99eb0579c0cc;hp=c816d0dece14e623ebdf3d68b60d68b3ae443466;hpb=03424a9be9636ae0811f4f724ae68db1c85fc4c4;p=lttng-tools.git

diff --git a/kconsumerd/kconsumerd.c b/kconsumerd/kconsumerd.c
index c816d0dec..c51e4adff 100644
--- a/kconsumerd/kconsumerd.c
+++ b/kconsumerd/kconsumerd.c
@@ -469,7 +469,8 @@ static int read_subbuffer(struct ltt_kconsumerd_fd *kconsumerd_fd)
 		goto end;
 	}
 
-	if (DEFAULT_CHANNEL_OUTPUT == LTTNG_KERNEL_SPLICE) {
+	switch (DEFAULT_KERNEL_CHANNEL_OUTPUT) {
+	case LTTNG_KERNEL_SPLICE:
 		/* read the whole subbuffer */
 		err = kernctl_get_padded_subbuf_size(infd, &len);
 		if (err != 0) {
@@ -487,7 +488,8 @@ static int read_subbuffer(struct ltt_kconsumerd_fd *kconsumerd_fd)
 			 */
 			ERR("Error splicing to tracefile");
 		}
-	} else if (DEFAULT_CHANNEL_OUTPUT == LTTNG_KERNEL_MMAP) {
+		break;
+	case LTTNG_KERNEL_MMAP:
 		/* read the used subbuffer size */
 		err = kernctl_get_subbuf_size(infd, &len);
 		if (err != 0) {
@@ -505,10 +507,10 @@ static int read_subbuffer(struct ltt_kconsumerd_fd *kconsumerd_fd)
 			 */
 			ERR("Error writing to tracefile");
 		}
-	} else {
+		break;
+	default:
 		ERR("Unknown output method");
 		ret = -1;
-		goto end;
 	}
 
 	err = kernctl_put_next_subbuf(infd);