History

Merge branch 'work.aio' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull aio iopriority support from Al Viro: "The rest of aio stuff for this cycle - Adam's aio ioprio series" * 'work.aio' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: fs: aio ioprio use ioprio_check_cap ret val fs: aio ioprio add explicit block layer dependence fs: iomap dio set bio prio from kiocb prio fs: blkdev set bio prio from kiocb prio fs: Add aio iopriority support fs: Convert kiocb rw_hint from enum to u16 block: add ioprio_check_cap function

Linus Torvalds committed 8 years ago

Commit 4a189982 parents 4189b86 9a6d9a68 files · +63 −9Browse files

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

Unified · Split

include/uapi/linux/aio_abi.h+1−0
@@ -53,6 +53,7 @@ enum { · 52 unmodified lines
53 * is valid.53 * is valid.
54 */54 */
55#define IOCB_FLAG_RESFD (1 << 0)55#define IOCB_FLAG_RESFD (1 << 0)
56#define IOCB_FLAG_IOPRIO (1 << 1)
56 57
57/* read() from /dev/aio returns these structures. */58/* read() from /dev/aio returns these structures. */
58struct io_event {59struct io_event {