Re: [PATCH 2/4] ext2: use iomap_fiemap to implement ->fiemap
From: Jan Kara <jack@suse.cz>
Date: 2021-07-26 13:42:48
Also in:
linux-fsdevel
On Tue 20-07-21 15:33:39, Christoph Hellwig wrote:
Switch from generic_block_fiemap to use the iomap version. The only interesting part is that ext2_get_blocks gets confused when being asked for overly long ranges, so copy over the limit to the inode size from generic_block_fiemap into ext2_fiemap. Signed-off-by: Christoph Hellwig <hch@lst.de>
Looks good. I'm a bit wondering about the problem with long ranges... I guess these are larger than s_maxbytes, aren't they? Anyway the solution you've picked makes sense to me. Feel free to add: Reviewed-by: Jan Kara <jack@suse.cz> Honza
quoted hunk ↗ jump to hunk
--- fs/ext2/inode.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c index 3e9a04770f49..04f0def0f5eb 100644 --- a/fs/ext2/inode.c +++ b/fs/ext2/inode.c@@ -855,8 +855,14 @@ const struct iomap_ops ext2_iomap_ops = { int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, u64 start, u64 len) { - return generic_block_fiemap(inode, fieinfo, start, len, - ext2_get_block); + int ret; + + inode_lock(inode); + len = min_t(u64, len, i_size_read(inode)); + ret = iomap_fiemap(inode, fieinfo, start, len, &ext2_iomap_ops); + inode_unlock(inode); + + return ret; } static int ext2_writepage(struct page *page, struct writeback_control *wbc)-- 2.30.2
-- Jan Kara [off-list ref] SUSE Labs, CR