X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=wrapper%2Fuuid.h;h=74946e23adc52993ef0cbcffbaea1ce4bbd5e7f4;hb=3b4aafcbbef722c5d04f2fe06a47c47d4d23eda0;hp=48b1a9fb7e63b4f6f07e12b8d87470ab643c23fd;hpb=886d51a3d7ed5fa6b41d7f19b3e14ae6c535a44c;p=lttng-modules.git

diff --git a/wrapper/uuid.h b/wrapper/uuid.h
index 48b1a9fb..74946e23 100644
--- a/wrapper/uuid.h
+++ b/wrapper/uuid.h
@@ -1,43 +1,28 @@
-#ifndef _LTTNG_WRAPPER_UUID_H
-#define _LTTNG_WRAPPER_UUID_H
-
-/*
- * wrapper/uuid.h
+/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
  *
- * Copyright (C) 2011-2012 Mathieu Desnoyers <mathieu.desnoyers@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.
- *
- * 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.
+ * wrapper/uuid.h
  *
- * 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
+ * Copyright (C) 2020 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#include <linux/version.h>
+#ifndef _LTTNG_WRAPPER_UUID_H
+#define _LTTNG_WRAPPER_UUID_H
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
+#include <linux/version.h>
 #include <linux/uuid.h>
-#else
-
-#include <linux/random.h>
-
-typedef struct {
-	__u8 b[16];
-} uuid_le;
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,7,0))
+static inline
+void lttng_guid_gen(guid_t *u)
+{
+	return guid_gen(u);
+}
+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,7,0)) */
 static inline
-void uuid_le_gen(uuid_le *u)
+void lttng_guid_gen(guid_t *u)
 {
-	generate_random_uuid(u->b);
+	return uuid_le_gen(u);
 }
+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,7,0)) */
 
-#endif
 #endif /* _LTTNG_WRAPPER_UUID_H */