diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-14 19:29:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-14 19:29:55 -0700 |
| commit | e253d98f5babbec7e6ced810f7335b265a7f7e83 (patch) | |
| tree | cd688c4ba8d43edb12bbeb523393879f7c212b65 /fs/aio.c | |
| parent | 0f0d12728e56c94d3289c6831243b6faeae8a19d (diff) | |
| parent | c35fc7a5abae9c154dd6f8c0b288462342facd45 (diff) | |
Merge branch 'work.read_write' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull nowait read support from Al Viro:
"Support IOCB_NOWAIT for buffered reads and block devices"
* 'work.read_write' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
block_dev: support RFW_NOWAIT on block device nodes
fs: support RWF_NOWAIT for buffered reads
fs: support IOCB_NOWAIT in generic_file_buffered_read
fs: pass iocb to do_generic_file_read
Diffstat (limited to 'fs/aio.c')
| -rw-r--r-- | fs/aio.c | 6 |
1 files changed, 0 insertions, 6 deletions
@@ -1606,12 +1606,6 @@ static int io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb, goto out_put_req; } - if ((req->common.ki_flags & IOCB_NOWAIT) && - !(req->common.ki_flags & IOCB_DIRECT)) { - ret = -EOPNOTSUPP; - goto out_put_req; - } - ret = put_user(KIOCB_KEY, &user_iocb->aio_key); if (unlikely(ret)) { pr_debug("EFAULT: aio_key\n"); |