Re: [PATCH 10/30] iomap: fix the iomap_readpage_actor return value for inline data
flat view
From: "Darrick J. Wong" <djwong@kernel.org>
Date: 2021-08-10 23:31:39
Also in:
linux-fsdevel, linux-xfs, nvdimm
On Mon, Aug 09, 2021 at 08:12:24AM +0200, Christoph Hellwig wrote:
The actor should never return a larger value than the length that was passed in. The current code handles this gracefully, but the opcoming iter model will be more picky.
s/opcoming/upcoming/ With that fixed, Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D
quoted hunk ↗ jump to hunk
Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/iomap/buffered-io.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 44587209e6d7c7..26e16cc9d44931 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c@@ -205,7 +205,7 @@ struct iomap_readpage_ctx { struct readahead_control *rac; }; -static int iomap_read_inline_data(struct inode *inode, struct page *page, +static loff_t iomap_read_inline_data(struct inode *inode, struct page *page, const struct iomap *iomap) { size_t size = i_size_read(inode) - iomap->offset;@@ -253,7 +253,7 @@ iomap_readpage_actor(struct inode *inode, loff_t pos, loff_t length, void *data, sector_t sector; if (iomap->type == IOMAP_INLINE) - return iomap_read_inline_data(inode, page, iomap); + return min(iomap_read_inline_data(inode, page, iomap), length); /* zero post-eof blocks as the page may be mapped */ iop = iomap_page_create(inode, page);-- 2.30.2