diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 14:38:55 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 14:38:55 -0500 |
| commit | 328198acb7407301ddf6005c0fa1e04bd0c539c8 (patch) | |
| tree | 9936112bd195bfbaacc9a75f2ea7ff757a2c0546 /mm/filemap.c | |
| parent | 9e0cb06b17be7e562cbdaba2768649f025826dc6 (diff) | |
| parent | fecb4a0c87c2bcaee1f3cf800126eef752a07ed3 (diff) | |
Merge branch 'master'
Diffstat (limited to 'mm/filemap.c')
| -rw-r--r-- | mm/filemap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 768687f1d46b..5d6e4c2000dc 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
| @@ -1030,8 +1030,8 @@ __generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov, | |||
| 1030 | desc.error = 0; | 1030 | desc.error = 0; |
| 1031 | do_generic_file_read(filp,ppos,&desc,file_read_actor); | 1031 | do_generic_file_read(filp,ppos,&desc,file_read_actor); |
| 1032 | retval += desc.written; | 1032 | retval += desc.written; |
| 1033 | if (!retval) { | 1033 | if (desc.error) { |
| 1034 | retval = desc.error; | 1034 | retval = retval ?: desc.error; |
| 1035 | break; | 1035 | break; |
| 1036 | } | 1036 | } |
| 1037 | } | 1037 | } |