X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-context-net-ns.c;h=b96afee8bc869074bb56c8af8d39d9f5079aec63;hb=2f333868d848f2bb2265f9a91c5cceb447348dfd;hp=4584991f2e0b582e077f2769e9976d09c43f2325;hpb=ceabb767180e064629b5a9ab4ed14449da864763;p=lttng-modules.git diff --git a/lttng-context-net-ns.c b/lttng-context-net-ns.c index 4584991f..b96afee8 100644 --- a/lttng-context-net-ns.c +++ b/lttng-context-net-ns.c @@ -16,12 +16,9 @@ #include #include #include -#include -#include #include -#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);