diff options
| author | Linus Torvalds | 2018-07-22 21:04:51 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2018-07-22 21:04:51 +0200 |
| commit | 165ea0d1c2286f550efbf14dc3528267af088f08 (patch) | |
| tree | 913ef8a34b31056ad13f04ec1dbb38a092974d88 /include/uapi/linux/aio_abi.h | |
| parent | alpha: fix osf_wait4() breakage (diff) | |
| parent | aio: don't expose __aio_sigset in uapi (diff) | |
| download | kernel-qcow2-linux-165ea0d1c2286f550efbf14dc3528267af088f08.tar.gz kernel-qcow2-linux-165ea0d1c2286f550efbf14dc3528267af088f08.tar.xz kernel-qcow2-linux-165ea0d1c2286f550efbf14dc3528267af088f08.zip | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro:
"Fix several places that screw up cleanups after failures halfway
through opening a file (one open-coding filp_clone_open() and getting
it wrong, two misusing alloc_file()). That part is -stable fodder from
the 'work.open' branch.
And Christoph's regression fix for uapi breakage in aio series;
include/uapi/linux/aio_abi.h shouldn't be pulling in the kernel
definition of sigset_t, the reason for doing so in the first place had
been bogus - there's no need to expose struct __aio_sigset in
aio_abi.h at all"
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
aio: don't expose __aio_sigset in uapi
ocxlflash_getfile(): fix double-iput() on alloc_file() failures
cxl_getfile(): fix double-iput() on alloc_file() failures
drm_mode_create_lease_ioctl(): fix open-coded filp_clone_open()
Diffstat (limited to 'include/uapi/linux/aio_abi.h')
| -rw-r--r-- | include/uapi/linux/aio_abi.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/uapi/linux/aio_abi.h b/include/uapi/linux/aio_abi.h index 3c5038b587ba..d4593a6062ef 100644 --- a/include/uapi/linux/aio_abi.h +++ b/include/uapi/linux/aio_abi.h @@ -29,7 +29,6 @@ #include <linux/types.h> #include <linux/fs.h> -#include <linux/signal.h> #include <asm/byteorder.h> typedef __kernel_ulong_t aio_context_t; @@ -110,10 +109,5 @@ struct iocb { #undef IFBIG #undef IFLITTLE -struct __aio_sigset { - const sigset_t __user *sigmask; - size_t sigsetsize; -}; - #endif /* __LINUX__AIO_ABI_H */ |