Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60927bc3 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

uuid: remove uuid_be defintions from the uapi header 



We don't use uuid_be and the UUID_BE constants in any uapi headers, so make
them private to the kernel.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAmir Goldstein <amir73il@gmail.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parent 12ce5f8c

include/linux/uuid.h

+15 −0
Original line number Diff line number Diff line
@@ -18,6 +18,21 @@ 


#include <uapi/linux/uuid.h>



typedef struct {

	__u8 b[16];

} uuid_be;



#define UUID_BE(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7)		\

((uuid_be)								\

{{ ((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) }})



#define NULL_UUID_BE							\

	UUID_BE(0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00,	\

		0x00, 0x00, 0x00, 0x00)



/*

 * The length of a UUID string ("aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee")

 * not including trailing NUL.

include/uapi/linux/uuid.h

+0 −16
Original line number Diff line number Diff line
@@ -24,10 +24,6 @@ typedef struct { 
	__u8 b[16];

} uuid_le;



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, \
@@ -35,20 +31,8 @@ typedef struct { 
   (c) & 0xff, ((c) >> 8) & 0xff,					\

   (d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) }})



#define UUID_BE(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7)		\

((uuid_be)								\

{{ ((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) }})



#define NULL_UUID_LE							\

	UUID_LE(0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00,	\

		0x00, 0x00, 0x00, 0x00)



#define NULL_UUID_BE							\

	UUID_BE(0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00,	\

		0x00, 0x00, 0x00, 0x00)





#endif /* _UAPI_LINUX_UUID_H_ */