Commit 740499c7 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong

iomap: fix the iomap_readpage_actor return value for inline data

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.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent 1acd9e9c
......@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment