From fb12e218bff15e0b0e5905a1986d3c64ec81e826 Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Fri, 1 Jun 2007 11:55:49 +0200
Subject: [PATCH] --- yaml --- r: 58521 b: refs/heads/master c:
 0452a4e5d021900b07ebdeecb9ed03b49f164f3f h: refs/heads/master i:   58519:
 31f2184ecca894e71dacc77fc00a80afad8f96f8 v: v3

---
 [refs]                   |  2 +-
 trunk/include/linux/fs.h |  1 -
 trunk/mm/filemap.c       | 20 --------------------
 3 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/[refs] b/[refs]
index 975e960ddc89..6af40bfbd818 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ffc4ef45b3b0a57872f631b4e4ceb8ace0d7496
+refs/heads/master: 0452a4e5d021900b07ebdeecb9ed03b49f164f3f
diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index 6a41f4cab14c..87c1d3e9d6cb 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/include/linux/fs.h
@@ -1762,7 +1762,6 @@ extern ssize_t generic_file_buffered_write(struct kiocb *, const struct iovec *,
 		unsigned long, loff_t, loff_t *, size_t, ssize_t);
 extern ssize_t do_sync_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos);
 extern ssize_t do_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos);
-extern ssize_t generic_file_sendfile(struct file *, loff_t *, size_t, read_actor_t, void *);
 extern void do_generic_mapping_read(struct address_space *mapping,
 				    struct file_ra_state *, struct file *,
 				    loff_t *, read_descriptor_t *, read_actor_t);
diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c
index d1d9814f99dd..c6ebd9f912ab 100644
--- a/trunk/mm/filemap.c
+++ b/trunk/mm/filemap.c
@@ -1245,26 +1245,6 @@ int file_send_actor(read_descriptor_t * desc, struct page *page, unsigned long o
 	return written;
 }
 
-ssize_t generic_file_sendfile(struct file *in_file, loff_t *ppos,
-			 size_t count, read_actor_t actor, void *target)
-{
-	read_descriptor_t desc;
-
-	if (!count)
-		return 0;
-
-	desc.written = 0;
-	desc.count = count;
-	desc.arg.data = target;
-	desc.error = 0;
-
-	do_generic_file_read(in_file, ppos, &desc, actor);
-	if (desc.written)
-		return desc.written;
-	return desc.error;
-}
-EXPORT_SYMBOL(generic_file_sendfile);
-
 static ssize_t
 do_readahead(struct address_space *mapping, struct file *filp,
 	     unsigned long index, unsigned long nr)