From 7684e7fcf69ddfbbeebdaac09b225121f68f0225 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 14 Aug 2017 09:22:14 -0700 Subject: [PATCH] scoutfs-utils: use exported types format.h and ioctl.h are copied from the kernel module. It had a habit of accidentally using types that aren't exported to userspace. It's since added build checks that enforce exported types. This copies the fixed use of exported types over for hopefully the last time. Signed-off-by: Zach Brown --- utils/src/format.h | 4 ++-- utils/src/ioctl.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/src/format.h b/utils/src/format.h index 6251c8f8..6c37816d 100644 --- a/utils/src/format.h +++ b/utils/src/format.h @@ -212,8 +212,8 @@ struct scoutfs_segment_item { __u8 nr_links; __le32 skip_links[0]; /* - * u8 key_bytes[key_len] - * u8 val_bytes[val_len] + * __u8 key_bytes[key_len] + * __u8 val_bytes[val_len] */ } __packed; diff --git a/utils/src/ioctl.h b/utils/src/ioctl.h index b8e8aa40..c1e7f6f9 100644 --- a/utils/src/ioctl.h +++ b/utils/src/ioctl.h @@ -114,7 +114,7 @@ struct scoutfs_ioctl_ino_path { } __packed; #define SCOUTFS_IOC_INO_PATH_CURSOR_BYTES \ - (sizeof(u64) + SCOUTFS_NAME_LEN + 1) + (sizeof(__u64) + SCOUTFS_NAME_LEN + 1) /* Get a single path from the root to the given inode number */ #define SCOUTFS_IOC_INO_PATH _IOW(SCOUTFS_IOCTL_MAGIC, 2, \