diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-08 13:00:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-08 13:00:20 -0400 |
| commit | 4a189982e293e662d719f5dd3ba6eec247d7bbc2 (patch) | |
| tree | a2384a2e4f56999a15fa80f0a07bff9fe23597f3 /include/uapi/linux | |
| parent | 4189b863ba327bac4a869773aea4995f7716945a (diff) | |
| parent | 9a6d9a62e0fd4b9927c3124db0f25fc6b4fb6576 (diff) | |
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
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/aio_abi.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/aio_abi.h b/include/uapi/linux/aio_abi.h index ed0185945bb2..75846164290e 100644 --- a/include/uapi/linux/aio_abi.h +++ b/include/uapi/linux/aio_abi.h | |||
| @@ -53,6 +53,7 @@ enum { | |||
| 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. */ |
| 58 | struct io_event { | 59 | struct io_event { |