Pull aio updates from Al Viro: "Majority of AIO stuff this cycle. aio-fsync and aio-poll, mostly. The only thing I'm holding back for a day or so is Adam's aio ioprio - his last-minute fixup is trivial (missing stub in !CONFIG_BLOCK case), but let it sit in -next for decency sake..." * 'work.aio-1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (46 commits) aio: sanitize the limit checking in io_submit(2) aio: fold do_io_submit() into callers aio: shift copyin of iocb into io_submit_one() aio_read_events_ring(): make a bit more readable aio: all callers of aio_{read,write,fsync,poll} treat 0 and -EIOCBQUEUED the same way aio: take list removal to (some) callers of aio_complete() aio: add missing break for the IOCB_CMD_FDSYNC case random: convert to ->poll_mask timerfd: convert to ->poll_mask eventfd: switch to ->poll_mask pipe: convert to ->poll_mask crypto: af_alg: convert to ->poll_mask net/rxrpc: convert to ->poll_mask net/iucv: convert to ->poll_mask net/phonet: convert to ->poll_mask net/nfc: convert to ->poll_mask net/caif: convert to ->poll_mask net/bluetooth: convert to ->poll_mask net/sctp: convert to ->poll_mask net/tipc: convert to ->poll_mask ...
Showing the changes to include/uapi (3 of 99 files). Show all
Unified · Split
| @@ -732,9 +732,11 @@ __SYSCALL(__NR_pkey_alloc, sys_pkey_alloc) · 731 unmodified lines | |||
| 732 | __SYSCALL(__NR_pkey_free, sys_pkey_free) | 732 | __SYSCALL(__NR_pkey_free, sys_pkey_free) |
| 733 | #define __NR_statx 291 | 733 | #define __NR_statx 291 |
| 734 | __SYSCALL(__NR_statx, sys_statx) | 734 | __SYSCALL(__NR_statx, sys_statx) |
| 735 | #define __NR_io_pgetevents 292 | ||
| 736 | __SC_COMP(__NR_io_pgetevents, sys_io_pgetevents, compat_sys_io_pgetevents) | ||
| 735 | 737 | ||
| 736 | #undef __NR_syscalls | 738 | #undef __NR_syscalls |
| 737 | #define __NR_syscalls 292 | 739 | #define __NR_syscalls 293 |
| 738 | 740 | ||
| 739 | /* | 741 | /* |
| 740 | * 32 bit systems traditionally used different | 742 | * 32 bit systems traditionally used different |
| @@ -29,6 +29,7 @@ · 28 unmodified lines | |||
| 29 | 29 | ||
| 30 | #include <linux/types.h> | 30 | #include <linux/types.h> |
| 31 | #include <linux/fs.h> | 31 | #include <linux/fs.h> |
| 32 | #include <linux/signal.h> | ||
| 32 | #include <asm/byteorder.h> | 33 | #include <asm/byteorder.h> |
| 33 | 34 | ||
| 34 | typedef __kernel_ulong_t aio_context_t; | 35 | typedef __kernel_ulong_t aio_context_t; |
| @@ -38,10 +39,8 @@ enum { · 3 unmodified lines | |||
| 38 | IOCB_CMD_PWRITE = 1, | 39 | IOCB_CMD_PWRITE = 1, |
| 39 | IOCB_CMD_FSYNC = 2, | 40 | IOCB_CMD_FSYNC = 2, |
| 40 | IOCB_CMD_FDSYNC = 3, | 41 | IOCB_CMD_FDSYNC = 3, |
| 41 | /* These two are experimental. | 42 | /* 4 was the experimental IOCB_CMD_PREADX */ |
| 42 | * IOCB_CMD_PREADX = 4, | 43 | IOCB_CMD_POLL = 5, |
| 43 | * IOCB_CMD_POLL = 5, | ||
| 44 | */ | ||
| 45 | IOCB_CMD_NOOP = 6, | 44 | IOCB_CMD_NOOP = 6, |
| 46 | IOCB_CMD_PREADV = 7, | 45 | IOCB_CMD_PREADV = 7, |
| 47 | IOCB_CMD_PWRITEV = 8, | 46 | IOCB_CMD_PWRITEV = 8, |
| @@ -108,5 +107,10 @@ struct iocb { · 60 unmodified lines | |||
| 108 | #undef IFBIG | 107 | #undef IFBIG |
| 109 | #undef IFLITTLE | 108 | #undef IFLITTLE |
| 110 | 109 | ||
| 110 | struct __aio_sigset { | ||
| 111 | sigset_t __user *sigmask; | ||
| 112 | size_t sigsetsize; | ||
| 113 | }; | ||
| 114 | |||
| 111 | #endif /* __LINUX__AIO_ABI_H */ | 115 | #endif /* __LINUX__AIO_ABI_H */ |
| 112 | 116 | ||
| @@ -49,11 +49,7 @@ typedef __u32 __bitwise __wsum; · 48 unmodified lines | |||
| 49 | #define __aligned_be64 __be64 __attribute__((aligned(8))) | 49 | #define __aligned_be64 __be64 __attribute__((aligned(8))) |
| 50 | #define __aligned_le64 __le64 __attribute__((aligned(8))) | 50 | #define __aligned_le64 __le64 __attribute__((aligned(8))) |
| 51 | 51 | ||
| 52 | #ifdef __CHECK_POLL | ||
| 53 | typedef unsigned __bitwise __poll_t; | 52 | typedef unsigned __bitwise __poll_t; |
| 54 | #else | ||
| 55 | typedef unsigned __poll_t; | ||
| 56 | #endif | ||
| 57 | 53 | ||
| 58 | #endif /* __ASSEMBLY__ */ | 54 | #endif /* __ASSEMBLY__ */ |
| 59 | #endif /* _UAPI_LINUX_TYPES_H */ | 55 | #endif /* _UAPI_LINUX_TYPES_H */ |