diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-13 01:35:51 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-13 01:35:51 +0200 |
| commit | 85ed13e78dbedf9433115a62c85429922bc5035c (patch) | |
| tree | 159866fd4d89b3c125a8627bd5153b739d4059c1 /fs/aio.c | |
| parent | Merge branch 'work.csum_and_copy' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | security/keys: remove compat_keyctl_instantiate_key_iov (diff) | |
| download | linux-85ed13e78dbedf9433115a62c85429922bc5035c.tar.xz linux-85ed13e78dbedf9433115a62c85429922bc5035c.zip | |
Merge branch 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull compat iovec cleanups from Al Viro:
"Christoph's series around import_iovec() and compat variant thereof"
* 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
security/keys: remove compat_keyctl_instantiate_key_iov
mm: remove compat_process_vm_{readv,writev}
fs: remove compat_sys_vmsplice
fs: remove the compat readv/writev syscalls
fs: remove various compat readv/writev helpers
iov_iter: transparently handle compat iovecs in import_iovec
iov_iter: refactor rw_copy_check_uvector and import_iovec
iov_iter: move rw_copy_check_uvector() into lib/iov_iter.c
compat.h: fix a spelling error in <linux/compat.h>
Diffstat (limited to 'fs/aio.c')
| -rw-r--r-- | fs/aio.c | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -1489,12 +1489,8 @@ static ssize_t aio_setup_rw(int rw, const struct iocb *iocb, *iovec = NULL; return ret; } -#ifdef CONFIG_COMPAT - if (compat) - return compat_import_iovec(rw, buf, len, UIO_FASTIOV, iovec, - iter); -#endif - return import_iovec(rw, buf, len, UIO_FASTIOV, iovec, iter); + + return __import_iovec(rw, buf, len, UIO_FASTIOV, iovec, iter, compat); } static inline void aio_rw_done(struct kiocb *req, ssize_t ret) |