X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-cgroup-ns.c;h=fe803449d46dec1aaa0f1d135ee34970a2722307;hb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;hp=d4053150c5432bcec4ca3a4f4bd9e7142e2185bb;hpb=735bef4705cc42f25d26f25be09ba98f1efb8511;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-cgroup-ns.c b/liblttng-ust/lttng-context-cgroup-ns.c
index d4053150..fe803449 100644
--- a/liblttng-ust/lttng-context-cgroup-ns.c
+++ b/liblttng-ust/lttng-context-cgroup-ns.c
@@ -1,27 +1,14 @@
 /*
- * 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
+#include <stddef.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -38,7 +25,7 @@
  * We cache the result to ensure we don't stat(2) the proc filesystem on
  * each event.
  */
-static DEFINE_URCU_TLS(ino_t, cached_cgroup_ns) = NS_INO_UNINITIALIZED;
+static DEFINE_URCU_TLS_INIT(ino_t, cached_cgroup_ns, NS_INO_UNINITIALIZED);
 
 static
 ino_t get_cgroup_ns(void)
@@ -142,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;