ext4: make ext4_set_iomap() recognize IOMAP_DELALLOC map type

Since ext4_map_blocks() can recognize a delayed allocated only extent,
make ext4_set_iomap() can also recognize it, and remove the useless
separate check in ext4_iomap_begin_report().

Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20240127015825.1608160-7-yi.zhang@huaweicloud.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 60f0d2dc1c3793003a40bcde869e5bfdf29fdb1e..2ccf3b5e3a7c4dcb1b0c6a9d27a3c8a77a145730 100644 (file)
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -3262,6 +3262,9 @@ static void ext4_set_iomap(struct inode *inode, struct iomap *iomap,
                iomap->addr = (u64) map->m_pblk << blkbits;
                if (flags & IOMAP_DAX)
                        iomap->addr += EXT4_SB(inode->i_sb)->s_dax_part_off;
+       } else if (map->m_flags & EXT4_MAP_DELAYED) {
+               iomap->type = IOMAP_DELALLOC;
+               iomap->addr = IOMAP_NULL_ADDR;
        } else {
                iomap->type = IOMAP_HOLE;
                iomap->addr = IOMAP_NULL_ADDR;
@@ -3424,35 +3427,11 @@ const struct iomap_ops ext4_iomap_overwrite_ops = {
        .iomap_end              = ext4_iomap_end,
 };
 
-static bool ext4_iomap_is_delalloc(struct inode *inode,
-                                  struct ext4_map_blocks *map)
-{
-       struct extent_status es;
-       ext4_lblk_t offset = 0, end = map->m_lblk + map->m_len - 1;
-
-       ext4_es_find_extent_range(inode, &ext4_es_is_delayed,
-                                 map->m_lblk, end, &es);
-
-       if (!es.es_len || es.es_lblk > end)
-               return false;
-
-       if (es.es_lblk > map->m_lblk) {
-               map->m_len = es.es_lblk - map->m_lblk;
-               return false;
-       }
-
-       offset = map->m_lblk - es.es_lblk;
-       map->m_len = es.es_len - offset;
-
-       return true;
-}
-
 static int ext4_iomap_begin_report(struct inode *inode, loff_t offset,
                                   loff_t length, unsigned int flags,
                                   struct iomap *iomap, struct iomap *srcmap)
 {
        int ret;
-       bool delalloc = false;
        struct ext4_map_blocks map;
        u8 blkbits = inode->i_blkbits;
 
@@ -3493,13 +3472,8 @@ static int ext4_iomap_begin_report(struct inode *inode, loff_t offset,
        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, flags);
-       if (delalloc && iomap->type == IOMAP_HOLE)
-               iomap->type = IOMAP_DELALLOC;
 
        return 0;
 }