Whamcloud - gitweb
LU-16803 build: Map uuid_le to guid_t for in-kernel APIs 85/50885/3
authorShaun Tancheff <shaun.tancheff@hpe.com>
Mon, 8 May 2023 12:37:46 +0000 (07:37 -0500)
committerOleg Drokin <green@whamcloud.com>
Fri, 19 May 2023 07:10:26 +0000 (07:10 +0000)
Linux commit v6.2-rc5-72-g5e6a51787fef
 uuid: Decouple guid_t and uuid_le types and respective macros

Removed uapi guid_t however sf_uuid is used in kernel which
must be a guid_t while uapi only has uuid_le.

Test-Parameters: trivial
Fixes: 20621c761b ("LU-16655 scrub: change sf_uuid to guid_t")
Signed-off-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Change-Id: I38e062b0e5ce9b8c32f60e41b7c95781717e1f97
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/50885
Tested-by: Maloo <maloo@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
lustre/include/uapi/linux/lustre/lustre_disk.h

index 94978ff..a8c5c71 100644 (file)
@@ -406,6 +406,11 @@ enum scrub_param {
        SP_DRYRUN       = 0x0002,
 };
 
+#ifdef __KERNEL__
+/* v6.2-rc5-72-g5e6a51787fef kernel APIs need type to be guid_t */
+#define uuid_le        guid_t
+#endif
+
 struct scrub_file {
        uuid_le sf_uuid;                    /* 128-bit uuid for volume */
        __u64   sf_flags;                   /* see 'enum scrub_flags' */