summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-04-04 14:20:57 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2014-05-06 17:39:44 -0400
commit6abd232274fd652e4a57f486d14e52ffee6f72e9 (patch)
tree714623d46866c2b3a1b0d2454222412a7ceb371a /mm
parentb42b15fdad3ebb790250041d1517acebb9bd56d9 (diff)
downloadlinux-stable-6abd232274fd652e4a57f486d14e52ffee6f72e9.tar.gz
linux-stable-6abd232274fd652e4a57f486d14e52ffee6f72e9.tar.bz2
linux-stable-6abd232274fd652e4a57f486d14e52ffee6f72e9.zip
bury generic_file_aio_{read,write}
no callers left Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'mm')
-rw-r--r--mm/filemap.c43
1 files changed, 8 insertions, 35 deletions
diff --git a/mm/filemap.c b/mm/filemap.c
index 7dcdb9db710d..2f724e3cdf24 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1663,6 +1663,14 @@ out:
return written ? written : error;
}
+/**
+ * generic_file_read_iter - generic filesystem read routine
+ * @iocb: kernel I/O control block
+ * @iter: destination for the data read
+ *
+ * This is the "read_iter()" routine for all filesystems
+ * that can use the page cache directly.
+ */
ssize_t
generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
{
@@ -1713,28 +1721,6 @@ out:
}
EXPORT_SYMBOL(generic_file_read_iter);
-/**
- * generic_file_aio_read - generic filesystem read routine
- * @iocb: kernel I/O control block
- * @iov: io vector request
- * @nr_segs: number of segments in the iovec
- * @pos: current file position
- *
- * This is the "read()" routine for all filesystems
- * that can use the page cache directly.
- */
-ssize_t
-generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
- unsigned long nr_segs, loff_t pos)
-{
- size_t count = iov_length(iov, nr_segs);
- struct iov_iter i;
-
- iov_iter_init(&i, READ, iov, nr_segs, count);
- return generic_file_read_iter(iocb, &i);
-}
-EXPORT_SYMBOL(generic_file_aio_read);
-
#ifdef CONFIG_MMU
/**
* page_cache_read - adds requested page to the page cache if not already there
@@ -2675,19 +2661,6 @@ ssize_t generic_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
}
EXPORT_SYMBOL(generic_file_write_iter);
-ssize_t generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
- unsigned long nr_segs, loff_t pos)
-{
- size_t count = iov_length(iov, nr_segs);
- struct iov_iter from;
-
- BUG_ON(iocb->ki_pos != pos);
-
- iov_iter_init(&from, WRITE, iov, nr_segs, count);
- return generic_file_write_iter(iocb, &from);
-}
-EXPORT_SYMBOL(generic_file_aio_write);
-
/**
* try_to_release_page() - release old fs-specific metadata on a page
*