summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-11 16:01:06 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-11 16:01:06 -0700
commitdc8a7b11aa68d6795a46e0a42ce92220d1a6f0cd (patch)
tree7b353684090d23b1e2e3f85bf83df491f04dcc8a /mm
parentd291676ce8bc1d8ef93488023d04027010596de3 (diff)
parent02a5e0acb3cb85d80d0fe834e366d38a92bbaa22 (diff)
downloadlinux-dc8a7b11aa68d6795a46e0a42ce92220d1a6f0cd.tar.bz2
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block: BLOCK: Hide the contents of linux/bio.h if CONFIG_BLOCK=n sysace: HDIO_GETGEO has it's own method for ages drivers/block/cpqarray.c: better error handling and kmalloc + memset conversion to k[cz]alloc drivers/block/cciss.c: kmalloc + memset conversion to kzalloc Clean up duplicate includes in drivers/block/ Fix remap handling by blktrace [PATCH] remove mm/filemap.c:file_send_actor()
Diffstat (limited to 'mm')
-rw-r--r--mm/filemap.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/mm/filemap.c b/mm/filemap.c
index 49a6fe375d01..90b657b50f81 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1218,26 +1218,6 @@ out:
}
EXPORT_SYMBOL(generic_file_aio_read);
-int file_send_actor(read_descriptor_t * desc, struct page *page, unsigned long offset, unsigned long size)
-{
- ssize_t written;
- unsigned long count = desc->count;
- struct file *file = desc->arg.data;
-
- if (size > count)
- size = count;
-
- written = file->f_op->sendpage(file, page, offset,
- size, &file->f_pos, size<count);
- if (written < 0) {
- desc->error = written;
- written = 0;
- }
- desc->count = count - written;
- desc->written += written;
- return written;
-}
-
static ssize_t
do_readahead(struct address_space *mapping, struct file *filp,
unsigned long index, unsigned long nr)