We don't use uuid_be and the UUID_BE constants in any uapi headers, so make them private to the kernel.
Showing the changes to include/uapi/linux (1 of 2 files). Show all
Unified · Split
| @@ -24,10 +24,6 @@ typedef struct { · 23 unmodified lines | |||
| 24 | __u8 b[16]; | 24 | __u8 b[16]; |
| 25 | } uuid_le; | 25 | } uuid_le; |
| 26 | 26 | ||
| 27 | typedef struct { | ||
| 28 | __u8 b[16]; | ||
| 29 | } uuid_be; | ||
| 30 | |||
| 31 | #define UUID_LE(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \ | 27 | #define UUID_LE(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \ |
| 32 | ((uuid_le) \ | 28 | ((uuid_le) \ |
| 33 | {{ (a) & 0xff, ((a) >> 8) & 0xff, ((a) >> 16) & 0xff, ((a) >> 24) & 0xff, \ | 29 | {{ (a) & 0xff, ((a) >> 8) & 0xff, ((a) >> 16) & 0xff, ((a) >> 24) & 0xff, \ |
| @@ -35,20 +31,8 @@ typedef struct { · 1 unmodified line | |||
| 35 | (c) & 0xff, ((c) >> 8) & 0xff, \ | 31 | (c) & 0xff, ((c) >> 8) & 0xff, \ |
| 36 | (d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) }}) | 32 | (d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) }}) |
| 37 | 33 | ||
| 38 | #define UUID_BE(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \ | ||
| 39 | ((uuid_be) \ | ||
| 40 | {{ ((a) >> 24) & 0xff, ((a) >> 16) & 0xff, ((a) >> 8) & 0xff, (a) & 0xff, \ | ||
| 41 | ((b) >> 8) & 0xff, (b) & 0xff, \ | ||
| 42 | ((c) >> 8) & 0xff, (c) & 0xff, \ | ||
| 43 | (d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) }}) | ||
| 44 | |||
| 45 | #define NULL_UUID_LE \ | 34 | #define NULL_UUID_LE \ |
| 46 | UUID_LE(0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, \ | 35 | UUID_LE(0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, \ |
| 47 | 0x00, 0x00, 0x00, 0x00) | 36 | 0x00, 0x00, 0x00, 0x00) |
| 48 | 37 | ||
| 49 | #define NULL_UUID_BE \ | ||
| 50 | UUID_BE(0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, \ | ||
| 51 | 0x00, 0x00, 0x00, 0x00) | ||
| 52 | |||
| 53 | |||
| 54 | #endif /* _UAPI_LINUX_UUID_H_ */ | 38 | #endif /* _UAPI_LINUX_UUID_H_ */ |