diff options
author | Christoph Hellwig <hch@hera.kernel.org> | 2005-05-27 01:16:24 -0700 |
---|---|---|
committer | Christoph Hellwig <hch@melbourne.sgi.com> | 2005-05-27 01:16:24 -0700 |
commit | b19312c4c8f3f84da57bba01d45549df1cf10dcd (patch) | |
tree | 1c34ce89be6b4e257bc03026d0268deb17727044 /mm/filemap.c | |
parent | d3870398fafd4911bd84573b78be4b6b762f32b0 (diff) | |
parent | 4ec5240ec367a592834385893200dd4fb369354c (diff) |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'mm/filemap.c')
-rw-r--r-- | mm/filemap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 47263ac3e4ea..1d33fec7bac6 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1004,7 +1004,7 @@ __generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov, if (pos < size) { retval = generic_file_direct_IO(READ, iocb, iov, pos, nr_segs); - if (retval >= 0 && !is_sync_kiocb(iocb)) + if (retval > 0 && !is_sync_kiocb(iocb)) retval = -EIOCBQUEUED; if (retval > 0) *ppos = pos + retval; |