X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Flinux%2Fuuid.h;h=a9990902871d1d9ed23224faad9c662af0eeb689;hb=d364661521d53cac21891bef4f406574d6332f15;hp=c8eeb708e34f9f31c5440e07689bd002170e70ad;hpb=c0e4aea9c85649bb5e551aca7b22596332755a6e;p=bcachefs-tools-debian

diff --git a/include/linux/uuid.h b/include/linux/uuid.h
index c8eeb70..a999090 100644
--- a/include/linux/uuid.h
+++ b/include/linux/uuid.h
@@ -18,32 +18,24 @@
 
 #include <string.h>
 #include <asm/types.h>
+#include <stdbool.h>
 
-typedef struct {
-	__u8 b[16];
-} uuid_le;
+#define UUID_SIZE 16
 
 typedef struct {
-	__u8 b[16];
-} uuid_be;
-
-#define UUID_LE(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7)		\
-((uuid_le)								\
-{{ (a) & 0xff, ((a) >> 8) & 0xff, ((a) >> 16) & 0xff, ((a) >> 24) & 0xff, \
-   (b) & 0xff, ((b) >> 8) & 0xff,					\
-   (c) & 0xff, ((c) >> 8) & 0xff,					\
-   (d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) }})
+	__u8 b[UUID_SIZE];
+} __uuid_t;
 
-#define UUID_BE(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7)		\
-((uuid_be)								\
+#define UUID_INIT(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7)			\
+((__uuid_t)								\
 {{ ((a) >> 24) & 0xff, ((a) >> 16) & 0xff, ((a) >> 8) & 0xff, (a) & 0xff, \
    ((b) >> 8) & 0xff, (b) & 0xff,					\
    ((c) >> 8) & 0xff, (c) & 0xff,					\
    (d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) }})
 
-static inline int uuid_le_cmp(const uuid_le u1, const uuid_le u2)
+static inline bool uuid_equal(const __uuid_t *u1, const __uuid_t *u2)
 {
-	return memcmp(&u1, &u2, sizeof(uuid_le));
+	return memcmp(u1, u2, sizeof(__uuid_t)) == 0;
 }
 
 #endif