* [PATCH v05 50/72] include/uapi/linux/fuse.h: use linux/types.h also in userspace [not found] <1471890809-4383-1-git-send-email-mikko.rapeli@iki.fi> @ 2016-08-22 18:33 ` Mikko Rapeli 2016-08-23 7:16 ` Miklos Szeredi 2016-08-22 18:33 ` [PATCH v05 65/72] uapi fcntl.h: glibc fcntl.h header file compatibility fixes Mikko Rapeli 1 sibling, 1 reply; 4+ messages in thread From: Mikko Rapeli @ 2016-08-22 18:33 UTC (permalink / raw) To: linux-kernel; +Cc: Mikko Rapeli, Arnd Bergmann, Miklos Szeredi, linux-fsdevel Kernel headers should not use stdint.h. Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Miklos Szeredi <miklos@szeredi.hu> --- include/uapi/linux/fuse.h | 452 +++++++++++++++++++++++----------------------- 1 file changed, 224 insertions(+), 228 deletions(-) diff --git a/include/uapi/linux/fuse.h b/include/uapi/linux/fuse.h index 27e1736..f9eadc7 100644 --- a/include/uapi/linux/fuse.h +++ b/include/uapi/linux/fuse.h @@ -113,11 +113,7 @@ #ifndef _LINUX_FUSE_H #define _LINUX_FUSE_H -#ifdef __KERNEL__ #include <linux/types.h> -#else -#include <stdint.h> -#endif /* * Version negotiation: @@ -152,42 +148,42 @@ userspace works under 64bit kernels */ struct fuse_attr { - uint64_t ino; - uint64_t size; - uint64_t blocks; - uint64_t atime; - uint64_t mtime; - uint64_t ctime; - uint32_t atimensec; - uint32_t mtimensec; - uint32_t ctimensec; - uint32_t mode; - uint32_t nlink; - uint32_t uid; - uint32_t gid; - uint32_t rdev; - uint32_t blksize; - uint32_t padding; + __u64 ino; + __u64 size; + __u64 blocks; + __u64 atime; + __u64 mtime; + __u64 ctime; + __u32 atimensec; + __u32 mtimensec; + __u32 ctimensec; + __u32 mode; + __u32 nlink; + __u32 uid; + __u32 gid; + __u32 rdev; + __u32 blksize; + __u32 padding; }; struct fuse_kstatfs { - uint64_t blocks; - uint64_t bfree; - uint64_t bavail; - uint64_t files; - uint64_t ffree; - uint32_t bsize; - uint32_t namelen; - uint32_t frsize; - uint32_t padding; - uint32_t spare[6]; + __u64 blocks; + __u64 bfree; + __u64 bavail; + __u64 files; + __u64 ffree; + __u32 bsize; + __u32 namelen; + __u32 frsize; + __u32 padding; + __u32 spare[6]; }; struct fuse_file_lock { - uint64_t start; - uint64_t end; - uint32_t type; - uint32_t pid; /* tgid */ + __u64 start; + __u64 end; + __u32 type; + __u32 pid; /* tgid */ }; /** @@ -388,149 +384,149 @@ enum fuse_notify_code { #define FUSE_COMPAT_ENTRY_OUT_SIZE 120 struct fuse_entry_out { - uint64_t nodeid; /* Inode ID */ - uint64_t generation; /* Inode generation: nodeid:gen must + __u64 nodeid; /* Inode ID */ + __u64 generation; /* Inode generation: nodeid:gen must be unique for the fs's lifetime */ - uint64_t entry_valid; /* Cache timeout for the name */ - uint64_t attr_valid; /* Cache timeout for the attributes */ - uint32_t entry_valid_nsec; - uint32_t attr_valid_nsec; + __u64 entry_valid; /* Cache timeout for the name */ + __u64 attr_valid; /* Cache timeout for the attributes */ + __u32 entry_valid_nsec; + __u32 attr_valid_nsec; struct fuse_attr attr; }; struct fuse_forget_in { - uint64_t nlookup; + __u64 nlookup; }; struct fuse_forget_one { - uint64_t nodeid; - uint64_t nlookup; + __u64 nodeid; + __u64 nlookup; }; struct fuse_batch_forget_in { - uint32_t count; - uint32_t dummy; + __u32 count; + __u32 dummy; }; struct fuse_getattr_in { - uint32_t getattr_flags; - uint32_t dummy; - uint64_t fh; + __u32 getattr_flags; + __u32 dummy; + __u64 fh; }; #define FUSE_COMPAT_ATTR_OUT_SIZE 96 struct fuse_attr_out { - uint64_t attr_valid; /* Cache timeout for the attributes */ - uint32_t attr_valid_nsec; - uint32_t dummy; + __u64 attr_valid; /* Cache timeout for the attributes */ + __u32 attr_valid_nsec; + __u32 dummy; struct fuse_attr attr; }; #define FUSE_COMPAT_MKNOD_IN_SIZE 8 struct fuse_mknod_in { - uint32_t mode; - uint32_t rdev; - uint32_t umask; - uint32_t padding; + __u32 mode; + __u32 rdev; + __u32 umask; + __u32 padding; }; struct fuse_mkdir_in { - uint32_t mode; - uint32_t umask; + __u32 mode; + __u32 umask; }; struct fuse_rename_in { - uint64_t newdir; + __u64 newdir; }; struct fuse_rename2_in { - uint64_t newdir; - uint32_t flags; - uint32_t padding; + __u64 newdir; + __u32 flags; + __u32 padding; }; struct fuse_link_in { - uint64_t oldnodeid; + __u64 oldnodeid; }; struct fuse_setattr_in { - uint32_t valid; - uint32_t padding; - uint64_t fh; - uint64_t size; - uint64_t lock_owner; - uint64_t atime; - uint64_t mtime; - uint64_t ctime; - uint32_t atimensec; - uint32_t mtimensec; - uint32_t ctimensec; - uint32_t mode; - uint32_t unused4; - uint32_t uid; - uint32_t gid; - uint32_t unused5; + __u32 valid; + __u32 padding; + __u64 fh; + __u64 size; + __u64 lock_owner; + __u64 atime; + __u64 mtime; + __u64 ctime; + __u32 atimensec; + __u32 mtimensec; + __u32 ctimensec; + __u32 mode; + __u32 unused4; + __u32 uid; + __u32 gid; + __u32 unused5; }; struct fuse_open_in { - uint32_t flags; - uint32_t unused; + __u32 flags; + __u32 unused; }; struct fuse_create_in { - uint32_t flags; - uint32_t mode; - uint32_t umask; - uint32_t padding; + __u32 flags; + __u32 mode; + __u32 umask; + __u32 padding; }; struct fuse_open_out { - uint64_t fh; - uint32_t open_flags; - uint32_t padding; + __u64 fh; + __u32 open_flags; + __u32 padding; }; struct fuse_release_in { - uint64_t fh; - uint32_t flags; - uint32_t release_flags; - uint64_t lock_owner; + __u64 fh; + __u32 flags; + __u32 release_flags; + __u64 lock_owner; }; struct fuse_flush_in { - uint64_t fh; - uint32_t unused; - uint32_t padding; - uint64_t lock_owner; + __u64 fh; + __u32 unused; + __u32 padding; + __u64 lock_owner; }; struct fuse_read_in { - uint64_t fh; - uint64_t offset; - uint32_t size; - uint32_t read_flags; - uint64_t lock_owner; - uint32_t flags; - uint32_t padding; + __u64 fh; + __u64 offset; + __u32 size; + __u32 read_flags; + __u64 lock_owner; + __u32 flags; + __u32 padding; }; #define FUSE_COMPAT_WRITE_IN_SIZE 24 struct fuse_write_in { - uint64_t fh; - uint64_t offset; - uint32_t size; - uint32_t write_flags; - uint64_t lock_owner; - uint32_t flags; - uint32_t padding; + __u64 fh; + __u64 offset; + __u32 size; + __u32 write_flags; + __u64 lock_owner; + __u32 flags; + __u32 padding; }; struct fuse_write_out { - uint32_t size; - uint32_t padding; + __u32 size; + __u32 padding; }; #define FUSE_COMPAT_STATFS_SIZE 48 @@ -540,32 +536,32 @@ struct fuse_statfs_out { }; struct fuse_fsync_in { - uint64_t fh; - uint32_t fsync_flags; - uint32_t padding; + __u64 fh; + __u32 fsync_flags; + __u32 padding; }; struct fuse_setxattr_in { - uint32_t size; - uint32_t flags; + __u32 size; + __u32 flags; }; struct fuse_getxattr_in { - uint32_t size; - uint32_t padding; + __u32 size; + __u32 padding; }; struct fuse_getxattr_out { - uint32_t size; - uint32_t padding; + __u32 size; + __u32 padding; }; struct fuse_lk_in { - uint64_t fh; - uint64_t owner; + __u64 fh; + __u64 owner; struct fuse_file_lock lk; - uint32_t lk_flags; - uint32_t padding; + __u32 lk_flags; + __u32 padding; }; struct fuse_lk_out { @@ -573,140 +569,140 @@ struct fuse_lk_out { }; struct fuse_access_in { - uint32_t mask; - uint32_t padding; + __u32 mask; + __u32 padding; }; struct fuse_init_in { - uint32_t major; - uint32_t minor; - uint32_t max_readahead; - uint32_t flags; + __u32 major; + __u32 minor; + __u32 max_readahead; + __u32 flags; }; #define FUSE_COMPAT_INIT_OUT_SIZE 8 #define FUSE_COMPAT_22_INIT_OUT_SIZE 24 struct fuse_init_out { - uint32_t major; - uint32_t minor; - uint32_t max_readahead; - uint32_t flags; - uint16_t max_background; - uint16_t congestion_threshold; - uint32_t max_write; - uint32_t time_gran; - uint32_t unused[9]; + __u32 major; + __u32 minor; + __u32 max_readahead; + __u32 flags; + __u16 max_background; + __u16 congestion_threshold; + __u32 max_write; + __u32 time_gran; + __u32 unused[9]; }; #define CUSE_INIT_INFO_MAX 4096 struct cuse_init_in { - uint32_t major; - uint32_t minor; - uint32_t unused; - uint32_t flags; + __u32 major; + __u32 minor; + __u32 unused; + __u32 flags; }; struct cuse_init_out { - uint32_t major; - uint32_t minor; - uint32_t unused; - uint32_t flags; - uint32_t max_read; - uint32_t max_write; - uint32_t dev_major; /* chardev major */ - uint32_t dev_minor; /* chardev minor */ - uint32_t spare[10]; + __u32 major; + __u32 minor; + __u32 unused; + __u32 flags; + __u32 max_read; + __u32 max_write; + __u32 dev_major; /* chardev major */ + __u32 dev_minor; /* chardev minor */ + __u32 spare[10]; }; struct fuse_interrupt_in { - uint64_t unique; + __u64 unique; }; struct fuse_bmap_in { - uint64_t block; - uint32_t blocksize; - uint32_t padding; + __u64 block; + __u32 blocksize; + __u32 padding; }; struct fuse_bmap_out { - uint64_t block; + __u64 block; }; struct fuse_ioctl_in { - uint64_t fh; - uint32_t flags; - uint32_t cmd; - uint64_t arg; - uint32_t in_size; - uint32_t out_size; + __u64 fh; + __u32 flags; + __u32 cmd; + __u64 arg; + __u32 in_size; + __u32 out_size; }; struct fuse_ioctl_iovec { - uint64_t base; - uint64_t len; + __u64 base; + __u64 len; }; struct fuse_ioctl_out { - int32_t result; - uint32_t flags; - uint32_t in_iovs; - uint32_t out_iovs; + __s32 result; + __u32 flags; + __u32 in_iovs; + __u32 out_iovs; }; struct fuse_poll_in { - uint64_t fh; - uint64_t kh; - uint32_t flags; - uint32_t events; + __u64 fh; + __u64 kh; + __u32 flags; + __u32 events; }; struct fuse_poll_out { - uint32_t revents; - uint32_t padding; + __u32 revents; + __u32 padding; }; struct fuse_notify_poll_wakeup_out { - uint64_t kh; + __u64 kh; }; struct fuse_fallocate_in { - uint64_t fh; - uint64_t offset; - uint64_t length; - uint32_t mode; - uint32_t padding; + __u64 fh; + __u64 offset; + __u64 length; + __u32 mode; + __u32 padding; }; struct fuse_in_header { - uint32_t len; - uint32_t opcode; - uint64_t unique; - uint64_t nodeid; - uint32_t uid; - uint32_t gid; - uint32_t pid; - uint32_t padding; + __u32 len; + __u32 opcode; + __u64 unique; + __u64 nodeid; + __u32 uid; + __u32 gid; + __u32 pid; + __u32 padding; }; struct fuse_out_header { - uint32_t len; - int32_t error; - uint64_t unique; + __u32 len; + __s32 error; + __u64 unique; }; struct fuse_dirent { - uint64_t ino; - uint64_t off; - uint32_t namelen; - uint32_t type; + __u64 ino; + __u64 off; + __u32 namelen; + __u32 type; char name[]; }; #define FUSE_NAME_OFFSET offsetof(struct fuse_dirent, name) #define FUSE_DIRENT_ALIGN(x) \ - (((x) + sizeof(uint64_t) - 1) & ~(sizeof(uint64_t) - 1)) + (((x) + sizeof(__u64) - 1) & ~(sizeof(__u64) - 1)) #define FUSE_DIRENT_SIZE(d) \ FUSE_DIRENT_ALIGN(FUSE_NAME_OFFSET + (d)->namelen) @@ -721,61 +717,61 @@ struct fuse_direntplus { FUSE_DIRENT_ALIGN(FUSE_NAME_OFFSET_DIRENTPLUS + (d)->dirent.namelen) struct fuse_notify_inval_inode_out { - uint64_t ino; - int64_t off; - int64_t len; + __u64 ino; + __s64 off; + __s64 len; }; struct fuse_notify_inval_entry_out { - uint64_t parent; - uint32_t namelen; - uint32_t padding; + __u64 parent; + __u32 namelen; + __u32 padding; }; struct fuse_notify_delete_out { - uint64_t parent; - uint64_t child; - uint32_t namelen; - uint32_t padding; + __u64 parent; + __u64 child; + __u32 namelen; + __u32 padding; }; struct fuse_notify_store_out { - uint64_t nodeid; - uint64_t offset; - uint32_t size; - uint32_t padding; + __u64 nodeid; + __u64 offset; + __u32 size; + __u32 padding; }; struct fuse_notify_retrieve_out { - uint64_t notify_unique; - uint64_t nodeid; - uint64_t offset; - uint32_t size; - uint32_t padding; + __u64 notify_unique; + __u64 nodeid; + __u64 offset; + __u32 size; + __u32 padding; }; /* Matches the size of fuse_write_in */ struct fuse_notify_retrieve_in { - uint64_t dummy1; - uint64_t offset; - uint32_t size; - uint32_t dummy2; - uint64_t dummy3; - uint64_t dummy4; + __u64 dummy1; + __u64 offset; + __u32 size; + __u32 dummy2; + __u64 dummy3; + __u64 dummy4; }; /* Device ioctls: */ -#define FUSE_DEV_IOC_CLONE _IOR(229, 0, uint32_t) +#define FUSE_DEV_IOC_CLONE _IOR(229, 0, __u32) struct fuse_lseek_in { - uint64_t fh; - uint64_t offset; - uint32_t whence; - uint32_t padding; + __u64 fh; + __u64 offset; + __u32 whence; + __u32 padding; }; struct fuse_lseek_out { - uint64_t offset; + __u64 offset; }; #endif /* _LINUX_FUSE_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v05 50/72] include/uapi/linux/fuse.h: use linux/types.h also in userspace 2016-08-22 18:33 ` [PATCH v05 50/72] include/uapi/linux/fuse.h: use linux/types.h also in userspace Mikko Rapeli @ 2016-08-23 7:16 ` Miklos Szeredi 2016-08-23 7:39 ` Mikko Rapeli 0 siblings, 1 reply; 4+ messages in thread From: Miklos Szeredi @ 2016-08-23 7:16 UTC (permalink / raw) To: Mikko Rapeli; +Cc: linux-kernel, Arnd Bergmann, linux-fsdevel On Mon, Aug 22, 2016 at 8:33 PM, Mikko Rapeli <mikko.rapeli@iki.fi> wrote: > Kernel headers should not use stdint.h. > NACK. This header is used by more than one OS. Having a different version for different OS's makes no sense, hence the choice of stdint. We've been over this many times. I'll do a patch with a big fat warning at the top of this header so that people don't spend time doing this useless conversion over and over again. Thanks, Miklos > Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi> > Cc: Arnd Bergmann <arnd@arndb.de> > Cc: Miklos Szeredi <miklos@szeredi.hu> > --- > include/uapi/linux/fuse.h | 452 +++++++++++++++++++++++----------------------- > 1 file changed, 224 insertions(+), 228 deletions(-) > > diff --git a/include/uapi/linux/fuse.h b/include/uapi/linux/fuse.h > index 27e1736..f9eadc7 100644 > --- a/include/uapi/linux/fuse.h > +++ b/include/uapi/linux/fuse.h > @@ -113,11 +113,7 @@ > #ifndef _LINUX_FUSE_H > #define _LINUX_FUSE_H > > -#ifdef __KERNEL__ > #include <linux/types.h> > -#else > -#include <stdint.h> > -#endif > > /* > * Version negotiation: > @@ -152,42 +148,42 @@ > userspace works under 64bit kernels */ > > struct fuse_attr { > - uint64_t ino; > - uint64_t size; > - uint64_t blocks; > - uint64_t atime; > - uint64_t mtime; > - uint64_t ctime; > - uint32_t atimensec; > - uint32_t mtimensec; > - uint32_t ctimensec; > - uint32_t mode; > - uint32_t nlink; > - uint32_t uid; > - uint32_t gid; > - uint32_t rdev; > - uint32_t blksize; > - uint32_t padding; > + __u64 ino; > + __u64 size; > + __u64 blocks; > + __u64 atime; > + __u64 mtime; > + __u64 ctime; > + __u32 atimensec; > + __u32 mtimensec; > + __u32 ctimensec; > + __u32 mode; > + __u32 nlink; > + __u32 uid; > + __u32 gid; > + __u32 rdev; > + __u32 blksize; > + __u32 padding; > }; > > struct fuse_kstatfs { > - uint64_t blocks; > - uint64_t bfree; > - uint64_t bavail; > - uint64_t files; > - uint64_t ffree; > - uint32_t bsize; > - uint32_t namelen; > - uint32_t frsize; > - uint32_t padding; > - uint32_t spare[6]; > + __u64 blocks; > + __u64 bfree; > + __u64 bavail; > + __u64 files; > + __u64 ffree; > + __u32 bsize; > + __u32 namelen; > + __u32 frsize; > + __u32 padding; > + __u32 spare[6]; > }; > > struct fuse_file_lock { > - uint64_t start; > - uint64_t end; > - uint32_t type; > - uint32_t pid; /* tgid */ > + __u64 start; > + __u64 end; > + __u32 type; > + __u32 pid; /* tgid */ > }; > > /** > @@ -388,149 +384,149 @@ enum fuse_notify_code { > #define FUSE_COMPAT_ENTRY_OUT_SIZE 120 > > struct fuse_entry_out { > - uint64_t nodeid; /* Inode ID */ > - uint64_t generation; /* Inode generation: nodeid:gen must > + __u64 nodeid; /* Inode ID */ > + __u64 generation; /* Inode generation: nodeid:gen must > be unique for the fs's lifetime */ > - uint64_t entry_valid; /* Cache timeout for the name */ > - uint64_t attr_valid; /* Cache timeout for the attributes */ > - uint32_t entry_valid_nsec; > - uint32_t attr_valid_nsec; > + __u64 entry_valid; /* Cache timeout for the name */ > + __u64 attr_valid; /* Cache timeout for the attributes */ > + __u32 entry_valid_nsec; > + __u32 attr_valid_nsec; > struct fuse_attr attr; > }; > > struct fuse_forget_in { > - uint64_t nlookup; > + __u64 nlookup; > }; > > struct fuse_forget_one { > - uint64_t nodeid; > - uint64_t nlookup; > + __u64 nodeid; > + __u64 nlookup; > }; > > struct fuse_batch_forget_in { > - uint32_t count; > - uint32_t dummy; > + __u32 count; > + __u32 dummy; > }; > > struct fuse_getattr_in { > - uint32_t getattr_flags; > - uint32_t dummy; > - uint64_t fh; > + __u32 getattr_flags; > + __u32 dummy; > + __u64 fh; > }; > > #define FUSE_COMPAT_ATTR_OUT_SIZE 96 > > struct fuse_attr_out { > - uint64_t attr_valid; /* Cache timeout for the attributes */ > - uint32_t attr_valid_nsec; > - uint32_t dummy; > + __u64 attr_valid; /* Cache timeout for the attributes */ > + __u32 attr_valid_nsec; > + __u32 dummy; > struct fuse_attr attr; > }; > > #define FUSE_COMPAT_MKNOD_IN_SIZE 8 > > struct fuse_mknod_in { > - uint32_t mode; > - uint32_t rdev; > - uint32_t umask; > - uint32_t padding; > + __u32 mode; > + __u32 rdev; > + __u32 umask; > + __u32 padding; > }; > > struct fuse_mkdir_in { > - uint32_t mode; > - uint32_t umask; > + __u32 mode; > + __u32 umask; > }; > > struct fuse_rename_in { > - uint64_t newdir; > + __u64 newdir; > }; > > struct fuse_rename2_in { > - uint64_t newdir; > - uint32_t flags; > - uint32_t padding; > + __u64 newdir; > + __u32 flags; > + __u32 padding; > }; > > struct fuse_link_in { > - uint64_t oldnodeid; > + __u64 oldnodeid; > }; > > struct fuse_setattr_in { > - uint32_t valid; > - uint32_t padding; > - uint64_t fh; > - uint64_t size; > - uint64_t lock_owner; > - uint64_t atime; > - uint64_t mtime; > - uint64_t ctime; > - uint32_t atimensec; > - uint32_t mtimensec; > - uint32_t ctimensec; > - uint32_t mode; > - uint32_t unused4; > - uint32_t uid; > - uint32_t gid; > - uint32_t unused5; > + __u32 valid; > + __u32 padding; > + __u64 fh; > + __u64 size; > + __u64 lock_owner; > + __u64 atime; > + __u64 mtime; > + __u64 ctime; > + __u32 atimensec; > + __u32 mtimensec; > + __u32 ctimensec; > + __u32 mode; > + __u32 unused4; > + __u32 uid; > + __u32 gid; > + __u32 unused5; > }; > > struct fuse_open_in { > - uint32_t flags; > - uint32_t unused; > + __u32 flags; > + __u32 unused; > }; > > struct fuse_create_in { > - uint32_t flags; > - uint32_t mode; > - uint32_t umask; > - uint32_t padding; > + __u32 flags; > + __u32 mode; > + __u32 umask; > + __u32 padding; > }; > > struct fuse_open_out { > - uint64_t fh; > - uint32_t open_flags; > - uint32_t padding; > + __u64 fh; > + __u32 open_flags; > + __u32 padding; > }; > > struct fuse_release_in { > - uint64_t fh; > - uint32_t flags; > - uint32_t release_flags; > - uint64_t lock_owner; > + __u64 fh; > + __u32 flags; > + __u32 release_flags; > + __u64 lock_owner; > }; > > struct fuse_flush_in { > - uint64_t fh; > - uint32_t unused; > - uint32_t padding; > - uint64_t lock_owner; > + __u64 fh; > + __u32 unused; > + __u32 padding; > + __u64 lock_owner; > }; > > struct fuse_read_in { > - uint64_t fh; > - uint64_t offset; > - uint32_t size; > - uint32_t read_flags; > - uint64_t lock_owner; > - uint32_t flags; > - uint32_t padding; > + __u64 fh; > + __u64 offset; > + __u32 size; > + __u32 read_flags; > + __u64 lock_owner; > + __u32 flags; > + __u32 padding; > }; > > #define FUSE_COMPAT_WRITE_IN_SIZE 24 > > struct fuse_write_in { > - uint64_t fh; > - uint64_t offset; > - uint32_t size; > - uint32_t write_flags; > - uint64_t lock_owner; > - uint32_t flags; > - uint32_t padding; > + __u64 fh; > + __u64 offset; > + __u32 size; > + __u32 write_flags; > + __u64 lock_owner; > + __u32 flags; > + __u32 padding; > }; > > struct fuse_write_out { > - uint32_t size; > - uint32_t padding; > + __u32 size; > + __u32 padding; > }; > > #define FUSE_COMPAT_STATFS_SIZE 48 > @@ -540,32 +536,32 @@ struct fuse_statfs_out { > }; > > struct fuse_fsync_in { > - uint64_t fh; > - uint32_t fsync_flags; > - uint32_t padding; > + __u64 fh; > + __u32 fsync_flags; > + __u32 padding; > }; > > struct fuse_setxattr_in { > - uint32_t size; > - uint32_t flags; > + __u32 size; > + __u32 flags; > }; > > struct fuse_getxattr_in { > - uint32_t size; > - uint32_t padding; > + __u32 size; > + __u32 padding; > }; > > struct fuse_getxattr_out { > - uint32_t size; > - uint32_t padding; > + __u32 size; > + __u32 padding; > }; > > struct fuse_lk_in { > - uint64_t fh; > - uint64_t owner; > + __u64 fh; > + __u64 owner; > struct fuse_file_lock lk; > - uint32_t lk_flags; > - uint32_t padding; > + __u32 lk_flags; > + __u32 padding; > }; > > struct fuse_lk_out { > @@ -573,140 +569,140 @@ struct fuse_lk_out { > }; > > struct fuse_access_in { > - uint32_t mask; > - uint32_t padding; > + __u32 mask; > + __u32 padding; > }; > > struct fuse_init_in { > - uint32_t major; > - uint32_t minor; > - uint32_t max_readahead; > - uint32_t flags; > + __u32 major; > + __u32 minor; > + __u32 max_readahead; > + __u32 flags; > }; > > #define FUSE_COMPAT_INIT_OUT_SIZE 8 > #define FUSE_COMPAT_22_INIT_OUT_SIZE 24 > > struct fuse_init_out { > - uint32_t major; > - uint32_t minor; > - uint32_t max_readahead; > - uint32_t flags; > - uint16_t max_background; > - uint16_t congestion_threshold; > - uint32_t max_write; > - uint32_t time_gran; > - uint32_t unused[9]; > + __u32 major; > + __u32 minor; > + __u32 max_readahead; > + __u32 flags; > + __u16 max_background; > + __u16 congestion_threshold; > + __u32 max_write; > + __u32 time_gran; > + __u32 unused[9]; > }; > > #define CUSE_INIT_INFO_MAX 4096 > > struct cuse_init_in { > - uint32_t major; > - uint32_t minor; > - uint32_t unused; > - uint32_t flags; > + __u32 major; > + __u32 minor; > + __u32 unused; > + __u32 flags; > }; > > struct cuse_init_out { > - uint32_t major; > - uint32_t minor; > - uint32_t unused; > - uint32_t flags; > - uint32_t max_read; > - uint32_t max_write; > - uint32_t dev_major; /* chardev major */ > - uint32_t dev_minor; /* chardev minor */ > - uint32_t spare[10]; > + __u32 major; > + __u32 minor; > + __u32 unused; > + __u32 flags; > + __u32 max_read; > + __u32 max_write; > + __u32 dev_major; /* chardev major */ > + __u32 dev_minor; /* chardev minor */ > + __u32 spare[10]; > }; > > struct fuse_interrupt_in { > - uint64_t unique; > + __u64 unique; > }; > > struct fuse_bmap_in { > - uint64_t block; > - uint32_t blocksize; > - uint32_t padding; > + __u64 block; > + __u32 blocksize; > + __u32 padding; > }; > > struct fuse_bmap_out { > - uint64_t block; > + __u64 block; > }; > > struct fuse_ioctl_in { > - uint64_t fh; > - uint32_t flags; > - uint32_t cmd; > - uint64_t arg; > - uint32_t in_size; > - uint32_t out_size; > + __u64 fh; > + __u32 flags; > + __u32 cmd; > + __u64 arg; > + __u32 in_size; > + __u32 out_size; > }; > > struct fuse_ioctl_iovec { > - uint64_t base; > - uint64_t len; > + __u64 base; > + __u64 len; > }; > > struct fuse_ioctl_out { > - int32_t result; > - uint32_t flags; > - uint32_t in_iovs; > - uint32_t out_iovs; > + __s32 result; > + __u32 flags; > + __u32 in_iovs; > + __u32 out_iovs; > }; > > struct fuse_poll_in { > - uint64_t fh; > - uint64_t kh; > - uint32_t flags; > - uint32_t events; > + __u64 fh; > + __u64 kh; > + __u32 flags; > + __u32 events; > }; > > struct fuse_poll_out { > - uint32_t revents; > - uint32_t padding; > + __u32 revents; > + __u32 padding; > }; > > struct fuse_notify_poll_wakeup_out { > - uint64_t kh; > + __u64 kh; > }; > > struct fuse_fallocate_in { > - uint64_t fh; > - uint64_t offset; > - uint64_t length; > - uint32_t mode; > - uint32_t padding; > + __u64 fh; > + __u64 offset; > + __u64 length; > + __u32 mode; > + __u32 padding; > }; > > struct fuse_in_header { > - uint32_t len; > - uint32_t opcode; > - uint64_t unique; > - uint64_t nodeid; > - uint32_t uid; > - uint32_t gid; > - uint32_t pid; > - uint32_t padding; > + __u32 len; > + __u32 opcode; > + __u64 unique; > + __u64 nodeid; > + __u32 uid; > + __u32 gid; > + __u32 pid; > + __u32 padding; > }; > > struct fuse_out_header { > - uint32_t len; > - int32_t error; > - uint64_t unique; > + __u32 len; > + __s32 error; > + __u64 unique; > }; > > struct fuse_dirent { > - uint64_t ino; > - uint64_t off; > - uint32_t namelen; > - uint32_t type; > + __u64 ino; > + __u64 off; > + __u32 namelen; > + __u32 type; > char name[]; > }; > > #define FUSE_NAME_OFFSET offsetof(struct fuse_dirent, name) > #define FUSE_DIRENT_ALIGN(x) \ > - (((x) + sizeof(uint64_t) - 1) & ~(sizeof(uint64_t) - 1)) > + (((x) + sizeof(__u64) - 1) & ~(sizeof(__u64) - 1)) > #define FUSE_DIRENT_SIZE(d) \ > FUSE_DIRENT_ALIGN(FUSE_NAME_OFFSET + (d)->namelen) > > @@ -721,61 +717,61 @@ struct fuse_direntplus { > FUSE_DIRENT_ALIGN(FUSE_NAME_OFFSET_DIRENTPLUS + (d)->dirent.namelen) > > struct fuse_notify_inval_inode_out { > - uint64_t ino; > - int64_t off; > - int64_t len; > + __u64 ino; > + __s64 off; > + __s64 len; > }; > > struct fuse_notify_inval_entry_out { > - uint64_t parent; > - uint32_t namelen; > - uint32_t padding; > + __u64 parent; > + __u32 namelen; > + __u32 padding; > }; > > struct fuse_notify_delete_out { > - uint64_t parent; > - uint64_t child; > - uint32_t namelen; > - uint32_t padding; > + __u64 parent; > + __u64 child; > + __u32 namelen; > + __u32 padding; > }; > > struct fuse_notify_store_out { > - uint64_t nodeid; > - uint64_t offset; > - uint32_t size; > - uint32_t padding; > + __u64 nodeid; > + __u64 offset; > + __u32 size; > + __u32 padding; > }; > > struct fuse_notify_retrieve_out { > - uint64_t notify_unique; > - uint64_t nodeid; > - uint64_t offset; > - uint32_t size; > - uint32_t padding; > + __u64 notify_unique; > + __u64 nodeid; > + __u64 offset; > + __u32 size; > + __u32 padding; > }; > > /* Matches the size of fuse_write_in */ > struct fuse_notify_retrieve_in { > - uint64_t dummy1; > - uint64_t offset; > - uint32_t size; > - uint32_t dummy2; > - uint64_t dummy3; > - uint64_t dummy4; > + __u64 dummy1; > + __u64 offset; > + __u32 size; > + __u32 dummy2; > + __u64 dummy3; > + __u64 dummy4; > }; > > /* Device ioctls: */ > -#define FUSE_DEV_IOC_CLONE _IOR(229, 0, uint32_t) > +#define FUSE_DEV_IOC_CLONE _IOR(229, 0, __u32) > > struct fuse_lseek_in { > - uint64_t fh; > - uint64_t offset; > - uint32_t whence; > - uint32_t padding; > + __u64 fh; > + __u64 offset; > + __u32 whence; > + __u32 padding; > }; > > struct fuse_lseek_out { > - uint64_t offset; > + __u64 offset; > }; > > #endif /* _LINUX_FUSE_H */ > -- > 2.8.1 > ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v05 50/72] include/uapi/linux/fuse.h: use linux/types.h also in userspace 2016-08-23 7:16 ` Miklos Szeredi @ 2016-08-23 7:39 ` Mikko Rapeli 0 siblings, 0 replies; 4+ messages in thread From: Mikko Rapeli @ 2016-08-23 7:39 UTC (permalink / raw) To: Miklos Szeredi; +Cc: linux-kernel, Arnd Bergmann, linux-fsdevel On Tue, Aug 23, 2016 at 09:16:22AM +0200, Miklos Szeredi wrote: > On Mon, Aug 22, 2016 at 8:33 PM, Mikko Rapeli <mikko.rapeli@iki.fi> wrote: > > Kernel headers should not use stdint.h. > > > > NACK. > > This header is used by more than one OS. Having a different version > for different OS's makes no sense, hence the choice of stdint. We've > been over this many times. I'll do a patch with a big fat warning at > the top of this header so that people don't spend time doing this > useless conversion over and over again. Yes, saw this coming. drm developers have the same problem. Is there some way to define which kernel uapi headers are allowed to use stdint.h definitions in userspace and which not? -Mikko ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v05 65/72] uapi fcntl.h: glibc fcntl.h header file compatibility fixes [not found] <1471890809-4383-1-git-send-email-mikko.rapeli@iki.fi> 2016-08-22 18:33 ` [PATCH v05 50/72] include/uapi/linux/fuse.h: use linux/types.h also in userspace Mikko Rapeli @ 2016-08-22 18:33 ` Mikko Rapeli 1 sibling, 0 replies; 4+ messages in thread From: Mikko Rapeli @ 2016-08-22 18:33 UTC (permalink / raw) To: linux-kernel Cc: Mikko Rapeli, Arnd Bergmann, Jeff Layton, J. Bruce Fields, David S. Miller, Nicolas Dichtel, linux-arch, linux-fsdevel Fixes these userspace compile warnings and error when glibc fcntl.h is included before linux/fcntl.h: asm-generic/fcntl.h:18:0: warning: "O_ACCMODE" redefined asm-generic/fcntl.h:19:0: warning: "O_RDONLY" redefined asm-generic/fcntl.h:20:0: warning: "O_WRONLY" redefined asm-generic/fcntl.h:21:0: warning: "O_RDWR" redefined asm-generic/fcntl.h:195:8: error: redefinition of ‘struct flock’ linux/fcntl.h:16:0: warning: "F_DUPFD_CLOEXEC" redefined Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi> --- include/uapi/asm-generic/fcntl.h | 6 ++++++ include/uapi/linux/fcntl.h | 3 +++ include/uapi/linux/libc-compat.h | 20 ++++++++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/include/uapi/asm-generic/fcntl.h b/include/uapi/asm-generic/fcntl.h index e063eff..3b429ce 100644 --- a/include/uapi/asm-generic/fcntl.h +++ b/include/uapi/asm-generic/fcntl.h @@ -1,6 +1,7 @@ #ifndef _ASM_GENERIC_FCNTL_H #define _ASM_GENERIC_FCNTL_H +#include <linux/libc-compat.h> #include <linux/types.h> /* @@ -15,10 +16,13 @@ * When introducing new O_* bits, please check its uniqueness in fcntl_init(). */ +#if __UAPI_DEF_O_ACCMODE_RDONLY_WRONLY_RDWR #define O_ACCMODE 00000003 #define O_RDONLY 00000000 #define O_WRONLY 00000001 #define O_RDWR 00000002 +#endif /* __UAPI_DEF_O_ACCMODE_RDONLY_WRONLY_RDWR */ + #ifndef O_CREAT #define O_CREAT 00000100 /* not fcntl */ #endif @@ -192,6 +196,7 @@ struct f_owner_ex { #define __ARCH_FLOCK_PAD #endif +#if __UAPI_DEF_FLOCK struct flock { short l_type; short l_whence; @@ -200,6 +205,7 @@ struct flock { __kernel_pid_t l_pid; __ARCH_FLOCK_PAD }; +#endif /* __UAPI_DEF_FLOCK */ #endif #ifndef HAVE_ARCH_STRUCT_FLOCK64 diff --git a/include/uapi/linux/fcntl.h b/include/uapi/linux/fcntl.h index beed138..279bcfb 100644 --- a/include/uapi/linux/fcntl.h +++ b/include/uapi/linux/fcntl.h @@ -1,6 +1,7 @@ #ifndef _UAPI_LINUX_FCNTL_H #define _UAPI_LINUX_FCNTL_H +#include <linux/libc-compat.h> #include <asm/fcntl.h> #define F_SETLEASE (F_LINUX_SPECIFIC_BASE + 0) @@ -13,7 +14,9 @@ #define F_CANCELLK (F_LINUX_SPECIFIC_BASE + 5) /* Create a file descriptor with FD_CLOEXEC set. */ +#if __UAPI_DEF_F_DUPFD_CLOEXEC #define F_DUPFD_CLOEXEC (F_LINUX_SPECIFIC_BASE + 6) +#endif /* __UAPI_DEF_F_DUPFD_CLOEXEC */ /* * Request nofications on a directory. diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h index 44b8a6b..40190a4 100644 --- a/include/uapi/linux/libc-compat.h +++ b/include/uapi/linux/libc-compat.h @@ -51,6 +51,21 @@ /* We have included glibc headers... */ #if defined(__GLIBC__) +/* Coordinate with glibc fcntl.h header. */ +#if defined(_FCNTL_H) + +#define __UAPI_DEF_FLOCK 0 +#define __UAPI_DEF_F_DUPFD_CLOEXEC 0 +#define __UAPI_DEF_O_ACCMODE_RDONLY_WRONLY_RDWR 0 + +#else /* defined(_FCNTL_H) */ + +#define __UAPI_DEF_FLOCK 1 +#define __UAPI_DEF_F_DUPFD_CLOEXEC 1 +#define __UAPI_DEF_O_ACCMODE_RDONLY_WRONLY_RDWR 1 + +#endif /* defined(_FCNTL_H) */ + /* Coordinate with glibc net/if.h header. */ #if defined(_NET_IF_H) && defined(__USE_MISC) @@ -170,6 +185,11 @@ * that we need. */ #else /* !defined(__GLIBC__) */ +/* Definitions for asm-generic/fcntl.h */ +#define __UAPI_DEF_FLOCK 1 +#define __UAPI_DEF_F_DUPFD_CLOEXEC 1 +#define __UAPI_DEF_O_ACCMODE_RDONLY_WRONLY_RDWR 1 + /* Definitions for if.h */ #define __UAPI_DEF_IF_IFCONF 1 #define __UAPI_DEF_IF_IFMAP 1 -- 2.8.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-08-23 7:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1471890809-4383-1-git-send-email-mikko.rapeli@iki.fi>
2016-08-22 18:33 ` [PATCH v05 50/72] include/uapi/linux/fuse.h: use linux/types.h also in userspace Mikko Rapeli
2016-08-23 7:16 ` Miklos Szeredi
2016-08-23 7:39 ` Mikko Rapeli
2016-08-22 18:33 ` [PATCH v05 65/72] uapi fcntl.h: glibc fcntl.h header file compatibility fixes Mikko Rapeli
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).