diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-04-01 19:57:03 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-04-01 19:57:03 -0700 |
commit | 88e6c0207623874922712e162e25d9dafd39661e (patch) | |
tree | d12cebdbb22ba1deff3d664543e87b45d821646e /fs/aio.c | |
parent | a4251ab9896cefd75926b11c45aa477f8464cdec (diff) | |
parent | 61e02cdb6ac68a84f1bb95026632d63677f26202 (diff) | |
download | linux-88e6c0207623874922712e162e25d9dafd39661e.tar.bz2 |
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs updates from Al Viro:
"Assorted bits and pieces"
* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
aio: drop needless assignment in aio_read()
clean overflow checks in count_mounts() a bit
seq_file: fix NULL pointer arithmetic warning
uml/x86: use x86 load_unaligned_zeropad()
asm/user.h: killed unused macros
constify struct path argument of finish_automount()/do_add_mount()
fs: Remove FIXME comment in generic_write_checks()
Diffstat (limited to 'fs/aio.c')
-rw-r--r-- | fs/aio.c | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -1552,7 +1552,6 @@ static int aio_read(struct kiocb *req, const struct iocb *iocb, file = req->ki_filp; if (unlikely(!(file->f_mode & FMODE_READ))) return -EBADF; - ret = -EINVAL; if (unlikely(!file->f_op->read_iter)) return -EINVAL; |