diff options
-rw-r--r-- | include/linux/fs.h | 1 | ||||
-rw-r--r-- | mm/filemap.c | 20 |
2 files changed, 0 insertions, 21 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 6bf139562947..16421f662a7a 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -1659,7 +1659,6 @@ extern int sb_min_blocksize(struct super_block *, int); | |||
1659 | extern int generic_file_mmap(struct file *, struct vm_area_struct *); | 1659 | extern int generic_file_mmap(struct file *, struct vm_area_struct *); |
1660 | extern int generic_file_readonly_mmap(struct file *, struct vm_area_struct *); | 1660 | extern int generic_file_readonly_mmap(struct file *, struct vm_area_struct *); |
1661 | extern int file_read_actor(read_descriptor_t * desc, struct page *page, unsigned long offset, unsigned long size); | 1661 | extern int file_read_actor(read_descriptor_t * desc, struct page *page, unsigned long offset, unsigned long size); |
1662 | extern int file_send_actor(read_descriptor_t * desc, struct page *page, unsigned long offset, unsigned long size); | ||
1663 | int generic_write_checks(struct file *file, loff_t *pos, size_t *count, int isblk); | 1662 | int generic_write_checks(struct file *file, loff_t *pos, size_t *count, int isblk); |
1664 | extern ssize_t generic_file_aio_read(struct kiocb *, const struct iovec *, unsigned long, loff_t); | 1663 | extern ssize_t generic_file_aio_read(struct kiocb *, const struct iovec *, unsigned long, loff_t); |
1665 | extern ssize_t generic_file_aio_write(struct kiocb *, const struct iovec *, unsigned long, loff_t); | 1664 | extern ssize_t generic_file_aio_write(struct kiocb *, const struct iovec *, unsigned long, loff_t); |
diff --git a/mm/filemap.c b/mm/filemap.c index 6cf700d41844..50021a60d01f 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
@@ -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) |