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 lib/vsprintf.c (1 of 6 files). Show all
Unified · Split
| @@ -1308,14 +1308,14 @@ char *uuid_string(char *buf, char *end, const u8 *addr, · 1307 unmodified lines | |||
| 1308 | char uuid[UUID_STRING_LEN + 1]; | 1308 | char uuid[UUID_STRING_LEN + 1]; |
| 1309 | char *p = uuid; | 1309 | char *p = uuid; |
| 1310 | int i; | 1310 | int i; |
| 1311 | const u8 *index = uuid_be_index; | 1311 | const u8 *index = uuid_index; |
| 1312 | bool uc = false; | 1312 | bool uc = false; |
| 1313 | 1313 | ||
| 1314 | switch (*(++fmt)) { | 1314 | switch (*(++fmt)) { |
| 1315 | case 'L': | 1315 | case 'L': |
| 1316 | uc = true; /* fall-through */ | 1316 | uc = true; /* fall-through */ |
| 1317 | case 'l': | 1317 | case 'l': |
| 1318 | index = uuid_le_index; | 1318 | index = guid_index; |
| 1319 | break; | 1319 | break; |
| 1320 | case 'B': | 1320 | case 'B': |
| 1321 | uc = true; | 1321 | uc = true; |