diff options
| author | Steve French <sfrench@hera.kernel.org> | 2005-05-31 17:32:44 -0400 |
|---|---|---|
| committer | Steve French <sfrench@hera.kernel.org> | 2005-05-31 17:32:44 -0400 |
| commit | af6f5e3247a68074e384ef93c0b4bce1b73c9d80 (patch) | |
| tree | 87b0f1e48bd0ca67a78fab0fa42b37864863fdfd /mm/filemap.c | |
| parent | 7e2987503dda95a5f80290bb8c06279009c2419e (diff) | |
| parent | 2e3e80c2b75e3815a0160cbd23d4fdb767d66b35 (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, | |||
| 1004 | if (pos < size) { | 1004 | if (pos < size) { |
| 1005 | retval = generic_file_direct_IO(READ, iocb, | 1005 | retval = generic_file_direct_IO(READ, iocb, |
| 1006 | iov, pos, nr_segs); | 1006 | iov, pos, nr_segs); |
| 1007 | if (retval >= 0 && !is_sync_kiocb(iocb)) | 1007 | if (retval > 0 && !is_sync_kiocb(iocb)) |
| 1008 | retval = -EIOCBQUEUED; | 1008 | retval = -EIOCBQUEUED; |
| 1009 | if (retval > 0) | 1009 | if (retval > 0) |
| 1010 | *ppos = pos + retval; | 1010 | *ppos = pos + retval; |