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
Showing the changes to include/uapi/linux (1 of 3 files). Show all
Unified · Split
| @@ -38,10 +38,8 @@ enum { · 37 unmodified lines | |||
| 38 | IOCB_CMD_PWRITE = 1, | 38 | IOCB_CMD_PWRITE = 1, |
| 39 | IOCB_CMD_FSYNC = 2, | 39 | IOCB_CMD_FSYNC = 2, |
| 40 | IOCB_CMD_FDSYNC = 3, | 40 | IOCB_CMD_FDSYNC = 3, |
| 41 | /* These two are experimental. | 41 | /* 4 was the experimental IOCB_CMD_PREADX */ |
| 42 | * IOCB_CMD_PREADX = 4, | 42 | IOCB_CMD_POLL = 5, |
| 43 | * IOCB_CMD_POLL = 5, | ||
| 44 | */ | ||
| 45 | IOCB_CMD_NOOP = 6, | 43 | IOCB_CMD_NOOP = 6, |
| 46 | IOCB_CMD_PREADV = 7, | 44 | IOCB_CMD_PREADV = 7, |
| 47 | IOCB_CMD_PWRITEV = 8, | 45 | IOCB_CMD_PWRITEV = 8, |