summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-02-11 22:36:48 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2014-04-01 23:19:38 -0400
commitccad2365668f12336dd497d9039e8584af836070 (patch)
treeff93cceb152f463c0bcc5ff7acc74ce51fc33d81
parent58bfab395b302306baccbd1b5f38a9b890acb4e3 (diff)
downloadop-kernel-dev-ccad2365668f12336dd497d9039e8584af836070.zip
op-kernel-dev-ccad2365668f12336dd497d9039e8584af836070.tar.gz
kill generic_file_buffered_write()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--include/linux/fs.h2
-rw-r--r--mm/filemap.c23
2 files changed, 1 insertions, 24 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 87be51a..c309b7a 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2398,8 +2398,6 @@ extern ssize_t generic_file_aio_write(struct kiocb *, const struct iovec *, unsi
extern ssize_t generic_file_direct_write(struct kiocb *, const struct iovec *,
unsigned long *, loff_t, size_t, size_t);
extern ssize_t generic_perform_write(struct file *, struct iov_iter *, loff_t);
-extern ssize_t generic_file_buffered_write(struct kiocb *, const struct iovec *,
- unsigned long, 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 int generic_segment_checks(const struct iovec *iov,
diff --git a/mm/filemap.c b/mm/filemap.c
index 09bfc9b..1a45514 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -76,7 +76,7 @@
* ->mmap_sem
* ->lock_page (access_process_vm)
*
- * ->i_mutex (generic_file_buffered_write)
+ * ->i_mutex (generic_perform_write)
* ->mmap_sem (fault_in_pages_readable->do_page_fault)
*
* bdi->wb.list_lock
@@ -2182,27 +2182,6 @@ again:
}
EXPORT_SYMBOL(generic_perform_write);
-ssize_t
-generic_file_buffered_write(struct kiocb *iocb, const struct iovec *iov,
- unsigned long nr_segs, loff_t pos,
- size_t count, ssize_t written)
-{
- struct file *file = iocb->ki_filp;
- ssize_t status;
- struct iov_iter i;
-
- iov_iter_init(&i, iov, nr_segs, count, written);
- status = generic_perform_write(file, &i, pos);
-
- if (likely(status >= 0)) {
- written += status;
- iocb->ki_pos = pos + status;
- }
-
- return written ? written : status;
-}
-EXPORT_SYMBOL(generic_file_buffered_write);
-
/**
* __generic_file_aio_write - write data to a file
* @iocb: IO state structure (file, offset, etc.)
OpenPOWER on IntegriCloud