X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fchannel.c;h=46256208d58d11fcd2fc2524be97f2a2cbccded8;hp=dc2c91ddc5bde29d07a14b8759a74671c924b51b;hb=4b5ab17b3aec396cfa096ecac1b990242072d644;hpb=88e3c2f5610b9ac89b0923d448fee34140fc46fb

diff --git a/src/bin/lttng-sessiond/channel.c b/src/bin/lttng-sessiond/channel.c
index dc2c91ddc..46256208d 100644
--- a/src/bin/lttng-sessiond/channel.c
+++ b/src/bin/lttng-sessiond/channel.c
@@ -28,7 +28,8 @@
 #include "channel.h"
 #include "lttng-sessiond.h"
 #include "kernel.h"
-#include "ust-ctl.h"
+#include "lttng-ust-ctl.h"
+#include "lttng-ust-error.h"
 #include "utils.h"
 #include "ust-app.h"
 #include "agent.h"
@@ -259,11 +260,6 @@ int channel_kernel_create(struct ltt_kernel_session *ksession,
 		attr->attr.overwrite = !!ksession->snapshot_mode;
 	}
 
-	/* Enforce mmap output for snapshot sessions. */
-	if (ksession->snapshot_mode) {
-		attr->attr.output = LTTNG_EVENT_MMAP;
-	}
-
 	/* Validate common channel properties. */
 	if (channel_validate(attr) < 0) {
 		ret = LTTNG_ERR_INVALID;
@@ -475,15 +471,6 @@ int channel_ust_create(struct ltt_ust_session *usess,
 		goto error_free_chan;
 	}
 
-	if (usess->active) {
-		/* Enable channel for global domain */
-		ret = ust_app_create_channel_glb(usess, uchan);
-		if (ret < 0 && ret != -LTTNG_UST_ERR_EXIST) {
-			ret = LTTNG_ERR_UST_CHAN_FAIL;
-			goto error_free_chan;
-		}
-	}
-
 	/* Adding the channel to the channel hash table. */
 	rcu_read_lock();
 	if (strncmp(uchan->name, DEFAULT_METADATA_NAME,