diff options
Diffstat (limited to 'mm/filemap.c')
-rw-r--r-- | mm/filemap.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index d5fdae2eb183..1d33fec7bac6 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
@@ -29,11 +29,6 @@ | |||
29 | #include <linux/security.h> | 29 | #include <linux/security.h> |
30 | #include <linux/syscalls.h> | 30 | #include <linux/syscalls.h> |
31 | /* | 31 | /* |
32 | * This is needed for the following functions: | ||
33 | * - try_to_release_page | ||
34 | * - block_invalidatepage | ||
35 | * - generic_osync_inode | ||
36 | * | ||
37 | * FIXME: remove all knowledge of the buffer layer from the core VM | 32 | * FIXME: remove all knowledge of the buffer layer from the core VM |
38 | */ | 33 | */ |
39 | #include <linux/buffer_head.h> /* for generic_osync_inode */ | 34 | #include <linux/buffer_head.h> /* for generic_osync_inode */ |
@@ -1009,7 +1004,7 @@ __generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov, | |||
1009 | if (pos < size) { | 1004 | if (pos < size) { |
1010 | retval = generic_file_direct_IO(READ, iocb, | 1005 | retval = generic_file_direct_IO(READ, iocb, |
1011 | iov, pos, nr_segs); | 1006 | iov, pos, nr_segs); |
1012 | if (retval >= 0 && !is_sync_kiocb(iocb)) | 1007 | if (retval > 0 && !is_sync_kiocb(iocb)) |
1013 | retval = -EIOCBQUEUED; | 1008 | retval = -EIOCBQUEUED; |
1014 | if (retval > 0) | 1009 | if (retval > 0) |
1015 | *ppos = pos + retval; | 1010 | *ppos = pos + retval; |