From: Goldwyn Rodrigues <rgoldwyn@suse.de>
To: linux-fsdevel@vger.kernel.org
Cc: linux-btrfs@vger.kernel.org, darrick.wong@oracle.com, hch@lst.de,
david@fromorbit.com, riteshh@linux.ibm.com,
Goldwyn Rodrigues <rgoldwyn@suse.com>
Subject: [PATCH 08/15] fs: Export generic_file_buffered_read()
Date: Sun, 1 Sep 2019 15:08:29 -0500 [thread overview]
Message-ID: <20190901200836.14959-9-rgoldwyn@suse.de> (raw)
In-Reply-To: <20190901200836.14959-1-rgoldwyn@suse.de>
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
Export generic_file_buffered_read() to be used to
supplement incomplete direct reads.
While we are at it, correct the comments and variable names.
Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
---
include/linux/fs.h | 2 ++
mm/filemap.c | 13 +++++++------
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 997a530ff4e9..26d827434060 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -3041,6 +3041,8 @@ extern int generic_file_rw_checks(struct file *file_in, struct file *file_out);
extern int generic_copy_file_checks(struct file *file_in, loff_t pos_in,
struct file *file_out, loff_t pos_out,
size_t *count, unsigned int flags);
+extern ssize_t generic_file_buffered_read(struct kiocb *iocb,
+ struct iov_iter *to, ssize_t already_read);
extern ssize_t generic_file_read_iter(struct kiocb *, struct iov_iter *);
extern ssize_t __generic_file_write_iter(struct kiocb *, struct iov_iter *);
extern ssize_t generic_file_write_iter(struct kiocb *, struct iov_iter *);
diff --git a/mm/filemap.c b/mm/filemap.c
index d0cf700bf201..2121ae01eae8 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2014,7 +2014,7 @@ static void shrink_readahead_size_eio(struct file *filp,
* generic_file_buffered_read - generic file read routine
* @iocb: the iocb to read
* @iter: data destination
- * @written: already copied
+ * @copied: already copied
*
* This is a generic file read routine, and uses the
* mapping->a_ops->readpage() function for the actual low-level stuff.
@@ -2023,11 +2023,11 @@ static void shrink_readahead_size_eio(struct file *filp,
* of the logic when it comes to error handling etc.
*
* Return:
- * * total number of bytes copied, including those the were already @written
+ * * total number of bytes copied, including those the were @copied
* * negative error code if nothing was copied
*/
-static ssize_t generic_file_buffered_read(struct kiocb *iocb,
- struct iov_iter *iter, ssize_t written)
+ssize_t generic_file_buffered_read(struct kiocb *iocb,
+ struct iov_iter *iter, ssize_t copied)
{
struct file *filp = iocb->ki_filp;
struct address_space *mapping = filp->f_mapping;
@@ -2168,7 +2168,7 @@ static ssize_t generic_file_buffered_read(struct kiocb *iocb,
prev_offset = offset;
put_page(page);
- written += ret;
+ copied += ret;
if (!iov_iter_count(iter))
goto out;
if (ret < nr) {
@@ -2276,8 +2276,9 @@ static ssize_t generic_file_buffered_read(struct kiocb *iocb,
*ppos = ((loff_t)index << PAGE_SHIFT) + offset;
file_accessed(filp);
- return written ? written : error;
+ return copied ? copied : error;
}
+EXPORT_SYMBOL_GPL(generic_file_buffered_read);
/**
* generic_file_read_iter - generic filesystem read routine
--
2.16.4
next prev parent reply other threads:[~2019-09-01 20:09 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-01 20:08 [PATCH v3 0/15] Btrfs iomap Goldwyn Rodrigues
2019-09-01 20:08 ` [PATCH 01/15] iomap: Introduce CONFIG_FS_IOMAP_DEBUG Goldwyn Rodrigues
2019-09-01 20:50 ` Darrick J. Wong
2019-09-02 16:29 ` Christoph Hellwig
2019-09-02 17:09 ` Darrick J. Wong
2019-09-02 17:18 ` Christoph Hellwig
2019-09-03 15:06 ` Darrick J. Wong
2019-09-01 20:08 ` [PATCH 02/15] iomap: Use a IOMAP_COW/srcmap for a read-modify-write I/O Goldwyn Rodrigues
2019-09-02 16:31 ` Christoph Hellwig
2019-09-03 3:18 ` Darrick J. Wong
2019-09-03 14:12 ` Goldwyn Rodrigues
2019-09-03 14:05 ` Goldwyn Rodrigues
2019-09-03 14:56 ` Darrick J. Wong
2019-09-01 20:08 ` [PATCH 03/15] iomap: Read page from srcmap for IOMAP_COW Goldwyn Rodrigues
2019-09-02 16:31 ` Christoph Hellwig
2019-09-02 17:01 ` Darrick J. Wong
2019-09-02 17:13 ` Christoph Hellwig
2019-09-01 20:08 ` [PATCH 04/15] btrfs: Eliminate PagePrivate for btrfs data pages Goldwyn Rodrigues
2019-09-01 20:08 ` [PATCH 05/15] btrfs: Add a simple buffered iomap write Goldwyn Rodrigues
2019-09-01 20:08 ` [PATCH 06/15] btrfs: Add CoW in iomap based writes Goldwyn Rodrigues
2019-09-01 20:08 ` [PATCH 07/15] btrfs: remove buffered write code made unnecessary Goldwyn Rodrigues
2019-09-01 20:08 ` Goldwyn Rodrigues [this message]
2019-09-01 20:08 ` [PATCH 09/15] btrfs: basic direct read operation Goldwyn Rodrigues
2019-09-01 20:08 ` [PATCH 10/15] btrfs: Carve out btrfs_get_extent_map_write() out of btrfs_get_blocks_write() Goldwyn Rodrigues
2019-09-01 20:08 ` [PATCH 11/15] btrfs: Rename __endio_write_update_ordered() to btrfs_update_ordered_extent() Goldwyn Rodrigues
2019-09-01 20:08 ` [PATCH 12/15] iomap: use a function pointer for dio submits Goldwyn Rodrigues
2019-09-02 16:41 ` Christoph Hellwig
2019-09-01 20:08 ` [PATCH 13/15] btrfs: Use iomap_dio_rw for performing direct I/O writes Goldwyn Rodrigues
2019-09-01 20:08 ` [PATCH 14/15] btrfs: Remove btrfs_dio_data and __btrfs_direct_write Goldwyn Rodrigues
2019-09-01 20:08 ` [PATCH 15/15] btrfs: update inode size during bio completion Goldwyn Rodrigues
2019-09-02 16:43 ` [PATCH v3 0/15] Btrfs iomap Christoph Hellwig
2019-09-03 3:51 ` Shiyang Ruan
2019-09-03 4:29 ` Darrick J. Wong
2019-09-03 5:00 ` Shiyang Ruan
2019-09-03 6:21 ` Christoph Hellwig
2019-09-03 13:44 ` Goldwyn Rodrigues
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190901200836.14959-9-rgoldwyn@suse.de \
--to=rgoldwyn@suse.de \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=hch@lst.de \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=rgoldwyn@suse.com \
--cc=riteshh@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).