History

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()

Linus Torvalds committed 8 years ago

Commit 165ea0d2 parents f88a333 9ba546c8 files · +14 −29Browse files

Showing the changes to include/uapi/linux (1 of 8 files). Show all

Unified · Split

include/uapi/linux/aio_abi.h+0−6
@@ -29,7 +29,6 @@ · 28 unmodified lines
2929
3030 #include <linux/types.h>
3131 #include <linux/fs.h>
32−#include <linux/signal.h>
3332 #include <asm/byteorder.h>
3433
3534 typedef __kernel_ulong_t aio_context_t;
@@ -110,10 +109,5 @@ struct iocb { · 74 unmodified lines
110109 #undef IFBIG
111110 #undef IFLITTLE
112111
113−struct __aio_sigset {
114− const sigset_t __user *sigmask;
115− size_t sigsetsize;
116−};
117−
118112 #endif /* __LINUX__AIO_ABI_H */
119113