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 6a41f4cab14..87c1d3e9d6c 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -1762,7 +1762,6 @@ extern ssize_t generic_file_buffered_write(struct kiocb *, const struct iovec *, | |||
1762 | unsigned long, loff_t, loff_t *, size_t, ssize_t); | 1762 | unsigned long, loff_t, loff_t *, size_t, ssize_t); |
1763 | extern ssize_t do_sync_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos); | 1763 | extern ssize_t do_sync_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos); |
1764 | extern ssize_t do_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos); | 1764 | extern ssize_t do_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos); |
1765 | extern ssize_t generic_file_sendfile(struct file *, loff_t *, size_t, read_actor_t, void *); | ||
1766 | extern void do_generic_mapping_read(struct address_space *mapping, | 1765 | extern void do_generic_mapping_read(struct address_space *mapping, |
1767 | struct file_ra_state *, struct file *, | 1766 | struct file_ra_state *, struct file *, |
1768 | loff_t *, read_descriptor_t *, read_actor_t); | 1767 | loff_t *, read_descriptor_t *, read_actor_t); |
diff --git a/mm/filemap.c b/mm/filemap.c index d1d9814f99d..c6ebd9f912a 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
@@ -1245,26 +1245,6 @@ int file_send_actor(read_descriptor_t * desc, struct page *page, unsigned long o | |||
1245 | return written; | 1245 | return written; |
1246 | } | 1246 | } |
1247 | 1247 | ||
1248 | ssize_t generic_file_sendfile(struct file *in_file, loff_t *ppos, | ||
1249 | size_t count, read_actor_t actor, void *target) | ||
1250 | { | ||
1251 | read_descriptor_t desc; | ||
1252 | |||
1253 | if (!count) | ||
1254 | return 0; | ||
1255 | |||
1256 | desc.written = 0; | ||
1257 | desc.count = count; | ||
1258 | desc.arg.data = target; | ||
1259 | desc.error = 0; | ||
1260 | |||
1261 | do_generic_file_read(in_file, ppos, &desc, actor); | ||
1262 | if (desc.written) | ||
1263 | return desc.written; | ||
1264 | return desc.error; | ||
1265 | } | ||
1266 | EXPORT_SYMBOL(generic_file_sendfile); | ||
1267 | |||
1268 | static ssize_t | 1248 | static ssize_t |
1269 | do_readahead(struct address_space *mapping, struct file *filp, | 1249 | do_readahead(struct address_space *mapping, struct file *filp, |
1270 | unsigned long index, unsigned long nr) | 1250 | unsigned long index, unsigned long nr) |