Skip to content

Commit b2c5764

Browse files
riteshharjanitytso
authored andcommitted
ext4: make ext4_ind_map_blocks work with fiemap
For indirect block mapping if the i_block > max supported block in inode then ext4_ind_map_blocks() returns a -EIO error. But in case of fiemap this could be a valid query to ->iomap_begin call. So check if the offset >= s_bitmap_maxbytes in ext4_iomap_begin_report(), then simply skip calling ext4_map_blocks(). Signed-off-by: Ritesh Harjani <[email protected]> Reviewed-by: Jan Kara <[email protected]> Link: https://lore.kernel.org/r/87fa0ddc5967fa707656212a3b66a7233425325c.1582880246.git.riteshh@linux.ibm.com Signed-off-by: Theodore Ts'o <[email protected]>
1 parent ac58e4f commit b2c5764

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

fs/ext4/inode.c

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3546,12 +3546,28 @@ static int ext4_iomap_begin_report(struct inode *inode, loff_t offset,
35463546
map.m_len = min_t(loff_t, (offset + length - 1) >> blkbits,
35473547
EXT4_MAX_LOGICAL_BLOCK) - map.m_lblk + 1;
35483548

3549+
/*
3550+
* Fiemap callers may call for offset beyond s_bitmap_maxbytes.
3551+
* So handle it here itself instead of querying ext4_map_blocks().
3552+
* Since ext4_map_blocks() will warn about it and will return
3553+
* -EIO error.
3554+
*/
3555+
if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) {
3556+
struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
3557+
3558+
if (offset >= sbi->s_bitmap_maxbytes) {
3559+
map.m_flags = 0;
3560+
goto set_iomap;
3561+
}
3562+
}
3563+
35493564
ret = ext4_map_blocks(NULL, inode, &map, 0);
35503565
if (ret < 0)
35513566
return ret;
35523567
if (ret == 0)
35533568
delalloc = ext4_iomap_is_delalloc(inode, &map);
35543569

3570+
set_iomap:
35553571
ext4_set_iomap(inode, iomap, &map, offset, length);
35563572
if (delalloc && iomap->type == IOMAP_HOLE)
35573573
iomap->type = IOMAP_DELALLOC;

0 commit comments

Comments
 (0)