diff options
author | Andreas Gruenbacher | 2017-10-16 15:06:23 +0200 |
---|---|---|
committer | Andreas Gruenbacher | 2017-10-16 15:06:23 +0200 |
commit | 0c9a66ec0e362fe9aff545b755430e56f58f2b96 (patch) | |
tree | 3ffc63e84133d640b9d7def9102ab62a30da460e /fs/aio.c | |
parent | gfs2: Always update inode ctime in set_acl (diff) | |
parent | iomap: Add IOMAP_F_DATA_INLINE flag (diff) | |
download | kernel-qcow2-linux-0c9a66ec0e362fe9aff545b755430e56f58f2b96.tar.gz kernel-qcow2-linux-0c9a66ec0e362fe9aff545b755430e56f58f2b96.tar.xz kernel-qcow2-linux-0c9a66ec0e362fe9aff545b755430e56f58f2b96.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
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"); |