X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-context-mnt-ns.c;h=c4bf5593fe9bd34ee8d1aab68ac2b2aa11c39a55;hb=b03cf820f4aea4e37df6603ddd499c96e23d66fc;hp=1757d5a40994ecfdc28088b745db734604dfe590;hpb=4697aac7ad1bdb932a843d93076418f4048baad3;p=lttng-modules.git diff --git a/src/lttng-context-mnt-ns.c b/src/lttng-context-mnt-ns.c index 1757d5a4..c4bf5593 100644 --- a/src/lttng-context-mnt-ns.c +++ b/src/lttng-context-mnt-ns.c @@ -9,6 +9,8 @@ * */ +#ifndef LTTNG_MNT_NS_MISSING_HEADER + #include #include #include @@ -17,12 +19,8 @@ #include #include #include -#include #include -#if !defined(LTTNG_MNT_NS_MISSING_HEADER) && \ - (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0)) - #include <../fs/mount.h> static @@ -50,7 +48,7 @@ void mnt_ns_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, * namespaces, just dereference the pointers. */ if (current->nsproxy) - mnt_ns_inum = current->nsproxy->mnt_ns->lttng_ns_inum; + mnt_ns_inum = current->nsproxy->mnt_ns->ns.inum; chan->ops->event_write(ctx, &mnt_ns_inum, sizeof(mnt_ns_inum), lttng_alignof(mnt_ns_inum)); } @@ -70,7 +68,7 @@ void mnt_ns_get_value(void *priv, * namespaces, just dereference the pointers. */ if (current->nsproxy) - mnt_ns_inum = current->nsproxy->mnt_ns->lttng_ns_inum; + mnt_ns_inum = current->nsproxy->mnt_ns->ns.inum; value->u.s64 = mnt_ns_inum; }