Our "little endian" UUID really is a Wintel GUID, so rename it and its helpers such (guid_t). The big endian UUID is the only true one, so give it the name uuid_t. The uuid_le and uuid_be names are retained for now, but will hopefully go away soon. The exception to that are the _cmp helpers that will be replaced by better primitives ASAP and thus don't get the new names. Also the _to_bin helpers are named to match the better named uuid_parse routine in userspace. Also remove the existing typedef in XFS that's now been superceeded by the generic type name. Signed-off-by: Christoph Hellwig <hch@lst.de> [andy: also update the UUID_LE/UUID_BE macros including fallout] Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Amir Goldstein <amir73il@gmail.com> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Showing the changes to include/uapi/linux (1 of 6 files). Show all
Unified · Split
| @@ -22,17 +22,21 @@ · 21 unmodified lines | ||
| 22 | 22 | |
| 23 | 23 | typedef struct { |
| 24 | 24 | __u8 b[16]; |
| 25 | −} uuid_le; | |
| 25 | +} guid_t; | |
| 26 | 26 | |
| 27 | −#define UUID_LE(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \ | |
| 28 | −((uuid_le) \ | |
| 27 | +#define GUID_INIT(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \ | |
| 28 | +((guid_t) \ | |
| 29 | 29 | {{ (a) & 0xff, ((a) >> 8) & 0xff, ((a) >> 16) & 0xff, ((a) >> 24) & 0xff, \ |
| 30 | 30 | (b) & 0xff, ((b) >> 8) & 0xff, \ |
| 31 | 31 | (c) & 0xff, ((c) >> 8) & 0xff, \ |
| 32 | 32 | (d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) }}) |
| 33 | 33 | |
| 34 | +/* backwards compatibility, don't use in new code */ | |
| 35 | +typedef guid_t uuid_le; | |
| 36 | +#define UUID_LE(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \ | |
| 37 | + GUID_INIT(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) | |
| 34 | 38 | #define NULL_UUID_LE \ |
| 35 | 39 | UUID_LE(0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, \ |
| 36 | − 0x00, 0x00, 0x00, 0x00) | |
| 40 | + 0x00, 0x00, 0x00, 0x00) | |
| 37 | 41 | |
| 38 | 42 | #endif /* _UAPI_LINUX_UUID_H_ */ |