diff options
| author | Ritesh Harjani <riteshh@linux.ibm.com> | 2020-02-28 10:26:57 +0100 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2020-03-14 19:43:12 +0100 |
| commit | b2c5764262edded1b1cfff5a6ca82c3d61bb4a4a (patch) | |
| tree | 24cb92726094661481c9a62bb4ed11c02ffc4d0c /fs/ext4 | |
| parent | ext4: move ext4 bmap to use iomap infrastructure (diff) | |
| download | linux-b2c5764262edded1b1cfff5a6ca82c3d61bb4a4a.tar.xz linux-b2c5764262edded1b1cfff5a6ca82c3d61bb4a4a.zip | |
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 <riteshh@linux.ibm.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/87fa0ddc5967fa707656212a3b66a7233425325c.1582880246.git.riteshh@linux.ibm.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/inode.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 07ca260b30ab..f6aebb792178 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3546,12 +3546,28 @@ static int ext4_iomap_begin_report(struct inode *inode, loff_t offset, map.m_len = min_t(loff_t, (offset + length - 1) >> blkbits, EXT4_MAX_LOGICAL_BLOCK) - map.m_lblk + 1; + /* + * Fiemap callers may call for offset beyond s_bitmap_maxbytes. + * So handle it here itself instead of querying ext4_map_blocks(). + * Since ext4_map_blocks() will warn about it and will return + * -EIO error. + */ + if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) { + struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb); + + if (offset >= sbi->s_bitmap_maxbytes) { + map.m_flags = 0; + goto set_iomap; + } + } + ret = ext4_map_blocks(NULL, inode, &map, 0); if (ret < 0) return ret; if (ret == 0) delalloc = ext4_iomap_is_delalloc(inode, &map); +set_iomap: ext4_set_iomap(inode, iomap, &map, offset, length); if (delalloc && iomap->type == IOMAP_HOLE) iomap->type = IOMAP_DELALLOC; |