X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-context-net-ns.c;h=490ea6f04180d87bbd56fd9dd29eca3e2f00a7f6;hb=refs%2Ftags%2Ffor-upstreaming-review-1;hp=4584991f2e0b582e077f2769e9976d09c43f2325;hpb=ceabb767180e064629b5a9ab4ed14449da864763;p=lttng-modules.git

diff --git a/lttng-context-net-ns.c b/lttng-context-net-ns.c
index 4584991f..490ea6f0 100644
--- a/lttng-context-net-ns.c
+++ b/lttng-context-net-ns.c
@@ -14,14 +14,11 @@
 #include <linux/sched.h>
 #include <linux/nsproxy.h>
 #include <net/net_namespace.h>
-#include <lttng-events.h>
-#include <wrapper/ringbuffer/frontend_types.h>
-#include <wrapper/vmalloc.h>
-#include <wrapper/namespace.h>
-#include <lttng-tracer.h>
+#include <lttng/lttng-events.h>
+#include <ringbuffer/frontend_types.h>
+#include <lttng/lttng-tracer.h>
 
-#if defined(CONFIG_NET_NS) && \
-	(LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
+#if defined(CONFIG_NET_NS)
 
 static
 size_t net_ns_get_size(size_t offset)
@@ -48,7 +45,7 @@ void net_ns_record(struct lttng_ctx_field *field,
 	 * namespaces, just dereference the pointers.
 	 */
 	if (current->nsproxy)
-		net_ns_inum = current->nsproxy->net_ns->lttng_ns_inum;
+		net_ns_inum = current->nsproxy->net_ns->ns.inum;
 
 	lib_ring_buffer_align_ctx(ctx, lttng_alignof(net_ns_inum));
 	chan->ops->event_write(ctx, &net_ns_inum, sizeof(net_ns_inum));
@@ -69,7 +66,7 @@ void net_ns_get_value(struct lttng_ctx_field *field,
 	 * namespaces, just dereference the pointers.
 	 */
 	if (current->nsproxy)
-		net_ns_inum = current->nsproxy->net_ns->lttng_ns_inum;
+		net_ns_inum = current->nsproxy->net_ns->ns.inum;
 
 	value->s64 = net_ns_inum;
 }
@@ -97,7 +94,6 @@ int lttng_add_net_ns_to_ctx(struct lttng_ctx **ctx)
 	field->record = net_ns_record;
 	field->get_value = net_ns_get_value;
 	lttng_context_update(*ctx);
-	wrapper_vmalloc_sync_all();
 	return 0;
 }
 EXPORT_SYMBOL_GPL(lttng_add_net_ns_to_ctx);