@@ -214,7 +214,18 @@ struct btrfs_ioctl_dev_info_args {
__u8 uuid[BTRFS_UUID_SIZE]; /* in/out */
__u64 bytes_used; /* out */
__u64 total_bytes; /* out */
- __u64 unused[379]; /* pad to 4k */
+ /*
+ * Optional, out.
+ *
+ * Showing the fsid of the device, allowing user space
+ * to check if this device is a seed one.
+ *
+ * Introduced in v6.3, thus user space still needs to
+ * check if kernel changed this value.
+ * Older kernel will not touch the values here.
+ */
+ __u8 fsid[BTRFS_UUID_SIZE];
+ __u64 unused[377]; /* pad to 4k */
__u8 path[BTRFS_DEVICE_PATH_NAME_MAX]; /* out */
};
BUILD_ASSERT(sizeof(struct btrfs_ioctl_dev_info_args) == 4096);
@@ -224,7 +224,18 @@ struct btrfs_ioctl_dev_info_args {
__u8 uuid[BTRFS_UUID_SIZE]; /* in/out */
__u64 bytes_used; /* out */
__u64 total_bytes; /* out */
- __u64 unused[379]; /* pad to 4k */
+ /*
+ * Optional, out.
+ *
+ * Showing the fsid of the device, allowing user space
+ * to check if this device is a seed one.
+ *
+ * Introduced in v6.3, thus user space still needs to
+ * check if kernel changed this value.
+ * Older kernel will not touch the values here.
+ */
+ __u8 fsid[BTRFS_UUID_SIZE];
+ __u64 unused[377]; /* pad to 4k */
__u8 path[BTRFS_DEVICE_PATH_NAME_MAX]; /* out */
};
This sync is mostly for the new member, btrfs_ioctl_dev_info_args::fsid. Signed-off-by: Qu Wenruo <wqu@suse.com> --- Changelog: v2: - Separate from the btrfs/249 fix The btrfs/249 fallback fix is a little too niche, and the proper fix is already merged - Only sync to "include/ioctl.h" and "libbtrfsutil/btrfs.h" --- include/ioctl.h | 13 ++++++++++++- libbtrfsutil/btrfs.h | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-)