[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20070729145752.GR16817@stusta.de>
Date: Sun, 29 Jul 2007 16:57:52 +0200
From: Adrian Bunk <bunk@...sta.de>
To: Jens Axboe <jens.axboe@...cle.com>
Cc: linux-kernel@...r.kernel.org
Subject: [2.6 patch] remove mm/filemap.c:file_send_actor()
This patch removes the no longer used file_send_actor().
Signed-off-by: Adrian Bunk <bunk@...sta.de>
---
include/linux/fs.h | 1 -
mm/filemap.c | 20 --------------------
2 files changed, 21 deletions(-)
--- linux-2.6.23-rc1-mm1/include/linux/fs.h.old 2007-07-26 14:57:09.000000000 +0200
+++ linux-2.6.23-rc1-mm1/include/linux/fs.h 2007-07-26 14:57:15.000000000 +0200
@@ -1776,7 +1776,6 @@
extern int generic_file_mmap(struct file *, struct vm_area_struct *);
extern int generic_file_readonly_mmap(struct file *, struct vm_area_struct *);
extern int file_read_actor(read_descriptor_t * desc, struct page *page, unsigned long offset, unsigned long size);
-extern int file_send_actor(read_descriptor_t * desc, struct page *page, unsigned long offset, unsigned long size);
int generic_write_checks(struct file *file, loff_t *pos, size_t *count, int isblk);
extern ssize_t generic_file_aio_read(struct kiocb *, const struct iovec *, unsigned long, loff_t);
extern ssize_t generic_file_aio_write(struct kiocb *, const struct iovec *, unsigned long, loff_t);
--- linux-2.6.23-rc1-mm1/mm/filemap.c.old 2007-07-26 14:59:05.000000000 +0200
+++ linux-2.6.23-rc1-mm1/mm/filemap.c 2007-07-26 14:59:16.000000000 +0200
@@ -1205,26 +1205,6 @@
}
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,
pgoff_t index, unsigned long nr)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists