diff options
Diffstat (limited to 'mm/filemap.c')
-rw-r--r-- | mm/filemap.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 6cf700d41844..90b657b50f81 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
@@ -843,7 +843,7 @@ static void shrink_readahead_size_eio(struct file *filp, | |||
843 | /** | 843 | /** |
844 | * do_generic_mapping_read - generic file read routine | 844 | * do_generic_mapping_read - generic file read routine |
845 | * @mapping: address_space to be read | 845 | * @mapping: address_space to be read |
846 | * @ra: file's readahead state | 846 | * @_ra: file's readahead state |
847 | * @filp: the file to read | 847 | * @filp: the file to read |
848 | * @ppos: current file position | 848 | * @ppos: current file position |
849 | * @desc: read_descriptor | 849 | * @desc: read_descriptor |
@@ -1218,26 +1218,6 @@ out: | |||
1218 | } | 1218 | } |
1219 | EXPORT_SYMBOL(generic_file_aio_read); | 1219 | EXPORT_SYMBOL(generic_file_aio_read); |
1220 | 1220 | ||
1221 | int file_send_actor(read_descriptor_t * desc, struct page *page, unsigned long offset, unsigned long size) | ||
1222 | { | ||
1223 | ssize_t written; | ||
1224 | unsigned long count = desc->count; | ||
1225 | struct file *file = desc->arg.data; | ||
1226 | |||
1227 | if (size > count) | ||
1228 | size = count; | ||
1229 | |||
1230 | written = file->f_op->sendpage(file, page, offset, | ||
1231 | size, &file->f_pos, size<count); | ||
1232 | if (written < 0) { | ||
1233 | desc->error = written; | ||
1234 | written = 0; | ||
1235 | } | ||
1236 | desc->count = count - written; | ||
1237 | desc->written += written; | ||
1238 | return written; | ||
1239 | } | ||
1240 | |||
1241 | static ssize_t | 1221 | static ssize_t |
1242 | do_readahead(struct address_space *mapping, struct file *filp, | 1222 | do_readahead(struct address_space *mapping, struct file *filp, |
1243 | unsigned long index, unsigned long nr) | 1223 | unsigned long index, unsigned long nr) |