diff options
| author | Thomas Gleixner <tglx@tglx.tec.linutronix.de> | 2005-05-23 15:11:45 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-05-23 15:11:45 +0200 |
| commit | f08276136bdc8607c1da493279569beb9859b133 (patch) | |
| tree | 5a4e7ea9300eece5ff5187fa7f64f0f48f37cf12 /mm/filemap.c | |
| parent | 7d27c8143c8234e1cae8285fd2d43c19dad69bde (diff) | |
| parent | 1263cc67c09bc7f913a6877f3ba0427f0b76617e (diff) | |
Merge with rsync://rsync.kernel.org/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; |