diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-14 06:56:23 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-14 06:56:23 +0300 |
| commit | f2be269897708700ed9b2a96f695348a10a003e8 (patch) | |
| tree | 74f0a1d5780dd53a71966fbe5d30a0bb0b361d12 /include/uapi | |
| parent | 4d2a073cde825dd1a0ce8ff8b6aef138997fbbd9 (diff) | |
| parent | e8693bcfa0b4a56268946f0756153d942cb66cf7 (diff) | |
| download | linux-f2be269897708700ed9b2a96f695348a10a003e8.tar.xz | |
Merge branch 'work.aio' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs aio updates from Al Viro:
"Christoph's aio poll, saner this time around.
This time it's pretty much local to fs/aio.c. Hopefully race-free..."
* 'work.aio' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
aio: allow direct aio poll comletions for keyed wakeups
aio: implement IOCB_CMD_POLL
aio: add a iocb refcount
timerfd: add support for keyed wakeups
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/aio_abi.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/uapi/linux/aio_abi.h b/include/uapi/linux/aio_abi.h index d4593a6062ef..ce43d340f010 100644 --- a/include/uapi/linux/aio_abi.h +++ b/include/uapi/linux/aio_abi.h @@ -38,10 +38,8 @@ enum { IOCB_CMD_PWRITE = 1, IOCB_CMD_FSYNC = 2, IOCB_CMD_FDSYNC = 3, - /* These two are experimental. - * IOCB_CMD_PREADX = 4, - * IOCB_CMD_POLL = 5, - */ + /* 4 was the experimental IOCB_CMD_PREADX */ + IOCB_CMD_POLL = 5, IOCB_CMD_NOOP = 6, IOCB_CMD_PREADV = 7, IOCB_CMD_PWRITEV = 8, |