wrapper: remove namespace.h wrapper

diff --git a/instrumentation/events/lttng-module/lttng-statedump.h b/instrumentation/events/lttng-module/lttng-statedump.h
index f8f10e7cab13d63547c4cbf764b16f9d040b4ccb..6e2dd9e76d275494c69fe90ca5a749d34e639a4a 100644 (file)
--- a/instrumentation/events/lttng-module/lttng-statedump.h
+++ b/instrumentation/events/lttng-module/lttng-statedump.h
@@ -15,7 +15,6 @@
 #include <linux/utsname.h>
 #include <linux/types.h>
 #include <linux/version.h>
-#include <wrapper/namespace.h>
 #include <wrapper/user_namespace.h>
 
 #ifndef LTTNG_MNT_NS_MISSING_HEADER
@@ -73,7 +72,7 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_cgroup_ns,
        TP_ARGS(session, p, cgroup_ns),
        TP_FIELDS(
                ctf_integer(pid_t, tid, p->pid)
-               ctf_integer(unsigned int, ns_inum, cgroup_ns ? cgroup_ns->lttng_ns_inum : 0)
+               ctf_integer(unsigned int, ns_inum, cgroup_ns ? cgroup_ns->ns.inum : 0)
        )
 )
 #endif
@@ -86,7 +85,7 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_ipc_ns,
        TP_FIELDS(
                ctf_integer(pid_t, tid, p->pid)
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
-               ctf_integer(unsigned int, ns_inum, ipc_ns ? ipc_ns->lttng_ns_inum : 0)
+               ctf_integer(unsigned int, ns_inum, ipc_ns ? ipc_ns->ns.inum : 0)
 #endif
        )
 )
@@ -100,7 +99,7 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_mnt_ns,
        TP_FIELDS(
                ctf_integer(pid_t, tid, p->pid)
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
-               ctf_integer(unsigned int, ns_inum, mnt_ns ? mnt_ns->lttng_ns_inum : 0)
+               ctf_integer(unsigned int, ns_inum, mnt_ns ? mnt_ns->ns.inum : 0)
 #endif
        )
 )
@@ -114,7 +113,7 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_net_ns,
        TP_FIELDS(
                ctf_integer(pid_t, tid, p->pid)
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
-               ctf_integer(unsigned int, ns_inum, net_ns ? net_ns->lttng_ns_inum : 0)
+               ctf_integer(unsigned int, ns_inum, net_ns ? net_ns->ns.inum : 0)
 #endif
        )
 )
@@ -143,7 +142,7 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_pid_ns,
                        }))
                ctf_integer(int, ns_level, pid_ns ? pid_ns->level : 0)
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
-               ctf_integer(unsigned int, ns_inum, pid_ns ? pid_ns->lttng_ns_inum : 0)
+               ctf_integer(unsigned int, ns_inum, pid_ns ? pid_ns->ns.inum : 0)
 #endif
        )
 )
@@ -161,7 +160,7 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_user_ns,
                ctf_integer(int, ns_level, user_ns ? user_ns->level : 0)
 #endif
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
-               ctf_integer(unsigned int, ns_inum, user_ns ? user_ns->lttng_ns_inum : 0)
+               ctf_integer(unsigned int, ns_inum, user_ns ? user_ns->ns.inum : 0)
 #endif
        )
 )
@@ -174,7 +173,7 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_uts_ns,
        TP_FIELDS(
                ctf_integer(pid_t, tid, p->pid)
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
-               ctf_integer(unsigned int, ns_inum, uts_ns ? uts_ns->lttng_ns_inum : 0)
+               ctf_integer(unsigned int, ns_inum, uts_ns ? uts_ns->ns.inum : 0)
 #endif
        )
 )

diff --git a/instrumentation/events/lttng-module/sched.h b/instrumentation/events/lttng-module/sched.h
index 80f85ca4012cb57fa47482005b322a9518f21bbf..e9d73475d37dbf78b9db048bda82ed54b76e3014 100644 (file)
--- a/instrumentation/events/lttng-module/sched.h
+++ b/instrumentation/events/lttng-module/sched.h
@@ -13,7 +13,6 @@
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0))
 #include <linux/sched/rt.h>
 #endif
-#include <wrapper/namespace.h>
 
 #define LTTNG_MAX_PID_NS_LEVEL 32
 
@@ -466,7 +465,7 @@ LTTNG_TRACEPOINT_EVENT_CODE(sched_process_fork,
                                        pid_ns = task_active_pid_ns(parent);
                                        if (pid_ns)
                                                parent_ns_inum =
-                                                       pid_ns->lttng_ns_inum;
+                                                       pid_ns->ns.inum;
                                }
                                parent_ns_inum;
                        }))
@@ -486,7 +485,7 @@ LTTNG_TRACEPOINT_EVENT_CODE(sched_process_fork,
                                        pid_ns = task_active_pid_ns(child);
                                        if (pid_ns)
                                                child_ns_inum =
-                                                       pid_ns->lttng_ns_inum;
+                                                       pid_ns->ns.inum;
                                }
                                child_ns_inum;
                        }))

diff --git a/lttng-context-cgroup-ns.c b/lttng-context-cgroup-ns.c
index 0c284966bcb97607e9997b835d6848484d1e2bf9..188c1d4434d6218ff7d42b27b5e6b00ffc294e46 100644 (file)
--- a/lttng-context-cgroup-ns.c
+++ b/lttng-context-cgroup-ns.c
@@ -15,7 +15,6 @@
 #include <linux/cgroup.h>
 #include <lttng-events.h>
 #include <wrapper/ringbuffer/frontend_types.h>
-#include <wrapper/namespace.h>
 #include <lttng-tracer.h>
 
 #if defined(CONFIG_CGROUPS) && \
@@ -47,7 +46,7 @@ void cgroup_ns_record(struct lttng_ctx_field *field,
         * namespaces, just dereference the pointers.
         */
        if (current->nsproxy)
-               cgroup_ns_inum = current->nsproxy->cgroup_ns->lttng_ns_inum;
+               cgroup_ns_inum = current->nsproxy->cgroup_ns->ns.inum;
 
        lib_ring_buffer_align_ctx(ctx, lttng_alignof(cgroup_ns_inum));
        chan->ops->event_write(ctx, &cgroup_ns_inum, sizeof(cgroup_ns_inum));
@@ -68,7 +67,7 @@ void cgroup_ns_get_value(struct lttng_ctx_field *field,
         * namespaces, just dereference the pointers.
         */
        if (current->nsproxy)
-               cgroup_ns_inum = current->nsproxy->cgroup_ns->lttng_ns_inum;
+               cgroup_ns_inum = current->nsproxy->cgroup_ns->ns.inum;
 
        value->s64 = cgroup_ns_inum;
 }

diff --git a/lttng-context-ipc-ns.c b/lttng-context-ipc-ns.c
index 09d8f2e3c2fb70439b5d9e3e9a2ee586593a51e0..4e9a60ee77769b0e30476f0f966d950d3a09e12e 100644 (file)
--- a/lttng-context-ipc-ns.c
+++ b/lttng-context-ipc-ns.c
@@ -15,7 +15,6 @@
 #include <linux/ipc_namespace.h>
 #include <lttng-events.h>
 #include <wrapper/ringbuffer/frontend_types.h>
-#include <wrapper/namespace.h>
 #include <lttng-tracer.h>
 
 #if defined(CONFIG_IPC_NS) && \
@@ -46,7 +45,7 @@ void ipc_ns_record(struct lttng_ctx_field *field,
         * namespaces, just dereference the pointers.
         */
        if (current->nsproxy)
-               ipc_ns_inum = current->nsproxy->ipc_ns->lttng_ns_inum;
+               ipc_ns_inum = current->nsproxy->ipc_ns->ns.inum;
 
        lib_ring_buffer_align_ctx(ctx, lttng_alignof(ipc_ns_inum));
        chan->ops->event_write(ctx, &ipc_ns_inum, sizeof(ipc_ns_inum));
@@ -67,7 +66,7 @@ void ipc_ns_get_value(struct lttng_ctx_field *field,
         * namespaces, just dereference the pointers.
         */
        if (current->nsproxy)
-               ipc_ns_inum = current->nsproxy->ipc_ns->lttng_ns_inum;
+               ipc_ns_inum = current->nsproxy->ipc_ns->ns.inum;
 
        value->s64 = ipc_ns_inum;
 }

diff --git a/lttng-context-mnt-ns.c b/lttng-context-mnt-ns.c
index 72e8efa1ffcf101464e3229afc5a04ea639b0c84..154517bd0d5f8ae7bd609cc6f06a29cda39bf86b 100644 (file)
--- a/lttng-context-mnt-ns.c
+++ b/lttng-context-mnt-ns.c
@@ -15,7 +15,6 @@
 #include <lttng-events.h>
 #include <linux/nsproxy.h>
 #include <wrapper/ringbuffer/frontend_types.h>
-#include <wrapper/namespace.h>
 #include <lttng-tracer.h>
 
 #if !defined(LTTNG_MNT_NS_MISSING_HEADER) && \
@@ -48,7 +47,7 @@ void mnt_ns_record(struct lttng_ctx_field *field,
         * 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;
 
        lib_ring_buffer_align_ctx(ctx, lttng_alignof(mnt_ns_inum));
        chan->ops->event_write(ctx, &mnt_ns_inum, sizeof(mnt_ns_inum));
@@ -69,7 +68,7 @@ void mnt_ns_get_value(struct lttng_ctx_field *field,
         * 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->s64 = mnt_ns_inum;
 }

diff --git a/lttng-context-net-ns.c b/lttng-context-net-ns.c
index 6cdd622a5518785a5ded4d86c470ee54bba326a9..459aa379da01decf067469a1622edc71240edaf2 100644 (file)
--- a/lttng-context-net-ns.c
+++ b/lttng-context-net-ns.c
@@ -16,7 +16,6 @@
 #include <net/net_namespace.h>
 #include <lttng-events.h>
 #include <wrapper/ringbuffer/frontend_types.h>
-#include <wrapper/namespace.h>
 #include <lttng-tracer.h>
 
 #if defined(CONFIG_NET_NS) && \
@@ -47,7 +46,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));
@@ -68,7 +67,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;
 }

diff --git a/lttng-context-pid-ns.c b/lttng-context-pid-ns.c
index cb1ee0d4d3b9eb6cb5996a442a11e2d9ea1676f8..1e95d6b33bbb19e83a734df18a7f45b299ad6fa6 100644 (file)
--- a/lttng-context-pid-ns.c
+++ b/lttng-context-pid-ns.c
@@ -15,7 +15,6 @@
 #include <linux/pid_namespace.h>
 #include <lttng-events.h>
 #include <wrapper/ringbuffer/frontend_types.h>
-#include <wrapper/namespace.h>
 #include <lttng-tracer.h>
 
 #if defined(CONFIG_PID_NS) && \
@@ -47,7 +46,7 @@ void pid_ns_record(struct lttng_ctx_field *field,
        ns = task_active_pid_ns(current);
 
        if (ns)
-               pid_ns_inum = ns->lttng_ns_inum;
+               pid_ns_inum = ns->ns.inum;
 
        lib_ring_buffer_align_ctx(ctx, lttng_alignof(pid_ns_inum));
        chan->ops->event_write(ctx, &pid_ns_inum, sizeof(pid_ns_inum));
@@ -69,7 +68,7 @@ void pid_ns_get_value(struct lttng_ctx_field *field,
        ns = task_active_pid_ns(current);
 
        if (ns)
-               pid_ns_inum = ns->lttng_ns_inum;
+               pid_ns_inum = ns->ns.inum;
 
        value->s64 = pid_ns_inum;
 }

diff --git a/lttng-context-user-ns.c b/lttng-context-user-ns.c
index bb08f8c18cbba6d69ec4ed2235416603b2908d92..1530638922ccabc5aeffa83885be3a1319fa5d25 100644 (file)
--- a/lttng-context-user-ns.c
+++ b/lttng-context-user-ns.c
@@ -15,7 +15,6 @@
 #include <linux/user_namespace.h>
 #include <lttng-events.h>
 #include <wrapper/ringbuffer/frontend_types.h>
-#include <wrapper/namespace.h>
 #include <lttng-tracer.h>
 
 #if defined(CONFIG_USER_NS) && \
@@ -39,7 +38,7 @@ void user_ns_record(struct lttng_ctx_field *field,
        unsigned int user_ns_inum = 0;
 
        if (current_user_ns())
-               user_ns_inum = current_user_ns()->lttng_ns_inum;
+               user_ns_inum = current_user_ns()->ns.inum;
 
        lib_ring_buffer_align_ctx(ctx, lttng_alignof(user_ns_inum));
        chan->ops->event_write(ctx, &user_ns_inum, sizeof(user_ns_inum));
@@ -53,7 +52,7 @@ void user_ns_get_value(struct lttng_ctx_field *field,
        unsigned int user_ns_inum = 0;
 
        if (current_user_ns())
-               user_ns_inum = current_user_ns()->lttng_ns_inum;
+               user_ns_inum = current_user_ns()->ns.inum;
 
        value->s64 = user_ns_inum;
 }

diff --git a/lttng-context-uts-ns.c b/lttng-context-uts-ns.c
index c6c6d072ba6dfbb619046bab2970484fed6702bd..cb8c60f172d899a14b3049f607a4ad955a28e604 100644 (file)
--- a/lttng-context-uts-ns.c
+++ b/lttng-context-uts-ns.c
@@ -15,7 +15,6 @@
 #include <linux/utsname.h>
 #include <lttng-events.h>
 #include <wrapper/ringbuffer/frontend_types.h>
-#include <wrapper/namespace.h>
 #include <lttng-tracer.h>
 
 #if defined(CONFIG_UTS_NS) && \
@@ -46,7 +45,7 @@ void uts_ns_record(struct lttng_ctx_field *field,
         * namespaces, just dereference the pointers.
         */
        if (current->nsproxy)
-               uts_ns_inum = current->nsproxy->uts_ns->lttng_ns_inum;
+               uts_ns_inum = current->nsproxy->uts_ns->ns.inum;
 
        lib_ring_buffer_align_ctx(ctx, lttng_alignof(uts_ns_inum));
        chan->ops->event_write(ctx, &uts_ns_inum, sizeof(uts_ns_inum));
@@ -67,7 +66,7 @@ void uts_ns_get_value(struct lttng_ctx_field *field,
         * namespaces, just dereference the pointers.
         */
        if (current->nsproxy)
-               uts_ns_inum = current->nsproxy->uts_ns->lttng_ns_inum;
+               uts_ns_inum = current->nsproxy->uts_ns->ns.inum;
 
        value->s64 = uts_ns_inum;
 }

diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c
index 07ffbf7f461f6397dcb2a3218585e409ac317e52..a40ef760902db32ac657072fb7cb881ef40f04df 100644 (file)
--- a/lttng-statedump-impl.c
+++ b/lttng-statedump-impl.c
@@ -37,7 +37,6 @@
 
 #include <lttng-events.h>
 #include <lttng-tracer.h>
-#include <wrapper/namespace.h>
 #include <wrapper/genhd.h>
 
 /* Define the tracepoints, but do not build the probes */
@@ -397,7 +396,7 @@ void lttng_statedump_process_ns(struct lttng_session *session,
                 * paranoid behavior of
                 * trace_lttng_statedump_process_user_ns().
                 */
-               user_ns = user_ns ? user_ns->lttng_user_ns_parent : NULL;
+               user_ns = user_ns ? user_ns->parent : NULL;
        } while (user_ns);
 
        /*

diff --git a/wrapper/namespace.h b/wrapper/namespace.h
deleted file mode 100644 (file)
index 8e8a371..0000000
--- a/wrapper/namespace.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
- *
- * wrapper/namespace.h
- *
- * Copyright (C) 2011-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *               2019 Michael Jeanson <mjeanson@efficios.com>
- *
- */
-
-#ifndef _LTTNG_WRAPPER_NAMESPACE_H
-#define _LTTNG_WRAPPER_NAMESPACE_H
-
-#include <linux/version.h>
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0))
-#define lttng_ns_inum ns.inum
-#else
-#define lttng_ns_inum proc_inum
-#endif
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0))
-#define lttng_user_ns_parent parent
-#else
-#define lttng_user_ns_parent creator->user_ns
-#endif
-
-#endif /* _LTTNG_WRAPPER_NAMESPACE_H */