X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-cgroup-ns.c;h=191fa9a74177165d9cd375bbd81a509c5afaef26;hb=071dec4386ff4c89d8b0f92ab1a8dbf079abd50c;hp=a6aca3abf60b3267599ef46473c43c02a95b3a36;hpb=cc58956cca1b3864a02b80882ead818b23225295;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-cgroup-ns.c b/liblttng-ust/lttng-context-cgroup-ns.c
index a6aca3ab..191fa9a7 100644
--- a/liblttng-ust/lttng-context-cgroup-ns.c
+++ b/liblttng-ust/lttng-context-cgroup-ns.c
@@ -1,24 +1,10 @@
 /*
- * lttng-context-cgroup-ns.c
- *
- * LTTng UST cgroup namespace context.
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
  * Copyright (C) 2009-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *               2019 Michael Jeanson <mjeanson@efficios.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
+ * Copyright (C) 2019 Michael Jeanson <mjeanson@efficios.com>
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * LTTng UST cgroup namespace context.
  */
 
 #define _LGPL_SOURCE
@@ -29,7 +15,7 @@
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
 #include <lttng/ringbuffer-config.h>
-#include <lttng/ust-tid.h>
+#include <ust-tid.h>
 #include <urcu/tls-compat.h>
 #include "lttng-tracer-core.h"
 #include "ns.h"
@@ -143,12 +129,12 @@ int lttng_add_cgroup_ns_to_ctx(struct lttng_ctx **ctx)
 	}
 	field->event_field.name = "cgroup_ns";
 	field->event_field.type.atype = atype_integer;
-	field->event_field.type.u.basic.integer.size = sizeof(ino_t) * CHAR_BIT;
-	field->event_field.type.u.basic.integer.alignment = lttng_alignof(ino_t) * CHAR_BIT;
-	field->event_field.type.u.basic.integer.signedness = lttng_is_signed_type(ino_t);
-	field->event_field.type.u.basic.integer.reverse_byte_order = 0;
-	field->event_field.type.u.basic.integer.base = 10;
-	field->event_field.type.u.basic.integer.encoding = lttng_encode_none;
+	field->event_field.type.u.integer.size = sizeof(ino_t) * CHAR_BIT;
+	field->event_field.type.u.integer.alignment = lttng_alignof(ino_t) * CHAR_BIT;
+	field->event_field.type.u.integer.signedness = lttng_is_signed_type(ino_t);
+	field->event_field.type.u.integer.reverse_byte_order = 0;
+	field->event_field.type.u.integer.base = 10;
+	field->event_field.type.u.integer.encoding = lttng_encode_none;
 	field->get_size = cgroup_ns_get_size;
 	field->record = cgroup_ns_record;
 	field->get_value = cgroup_ns_get_value;