X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttng-events.c;h=168c3b26b9d62d5195449550f06cc2fcdddd29a5;hb=3a523f5b6b4f8ca82412cb45f2d2ad9c44e7d249;hp=7a1be7295a7ef33d1e61f692d9a2926c0ed03d77;hpb=a605814333fe405404f42d5e5de51db234a538fe;p=lttng-modules.git

diff --git a/lttng-events.c b/lttng-events.c
index 7a1be729..168c3b26 100644
--- a/lttng-events.c
+++ b/lttng-events.c
@@ -30,6 +30,7 @@
 #include "wrapper/uuid.h"
 #include "wrapper/vmalloc.h"	/* for wrapper_vmalloc_sync_all() */
 #include "wrapper/random.h"
+#include "wrapper/tracepoint.h"
 #include "lttng-events.h"
 #include "lttng-tracer.h"
 
@@ -316,7 +317,7 @@ struct lttng_event *lttng_event_create(struct lttng_channel *chan,
 		event->desc = lttng_event_get(event_param->name);
 		if (!event->desc)
 			goto register_error;
-		ret = tracepoint_probe_register(event_param->name,
+		ret = kabi_2635_tracepoint_probe_register(event_param->name,
 				event->desc->probe_callback,
 				event);
 		if (ret)
@@ -420,7 +421,7 @@ int _lttng_event_unregister(struct lttng_event *event)
 
 	switch (event->instrumentation) {
 	case LTTNG_KERNEL_TRACEPOINT:
-		ret = tracepoint_probe_unregister(event->desc->name,
+		ret = kabi_2635_tracepoint_probe_unregister(event->desc->name,
 						  event->desc->probe_callback,
 						  event);
 		if (ret)
@@ -903,7 +904,6 @@ int _lttng_session_metadata_statedump(struct lttng_session *session)
 	unsigned char uuid_s[37], clock_uuid_s[BOOT_ID_LEN];
 	struct lttng_channel *chan;
 	struct lttng_event *event;
-	char hostname[__NEW_UTS_LEN + 1];
 	int ret = 0;
 
 	if (!ACCESS_ONCE(session->active))
@@ -960,11 +960,6 @@ int _lttng_session_metadata_statedump(struct lttng_session *session)
 	if (ret)
 		goto end;
 
-	rcu_read_lock();
-	memcpy(hostname, task_nsproxy(current)->uts_ns->name.nodename,
-		sizeof(hostname));
-	rcu_read_unlock();
-
 	ret = lttng_metadata_printf(session,
 		"env {\n"
 		"	hostname = \"%s\";\n"
@@ -977,7 +972,7 @@ int _lttng_session_metadata_statedump(struct lttng_session *session)
 		"	tracer_minor = %d;\n"
 		"	tracer_patchlevel = %d;\n"
 		"};\n\n",
-		hostname,
+		current->nsproxy->uts_ns->name.nodename,
 		utsname()->sysname,
 		utsname()->release,
 		utsname()->version,