ext4: cleanup for ext4_map_blocks

Retval from ext4_map_create_blocks means we really create some blocks,
cannot happened with m_flags without EXT4_MAP_UNWRITTEN and
EXT4_MAP_MAPPED.

Reviewed-by: Zhang Yi <yi.zhang@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Baokun Li <libaokun1@huawei.com>
Signed-off-by: Yang Erkun <yangerkun@huawei.com>
Message-ID: <20251112084538.1658232-3-yangerkun@huawei.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 3883793425cb124753352e1a06fffb80ba62e090..8e694c56d3b6220e4b128502971f9f4b3da6e9e3 100644 (file)
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -816,7 +816,13 @@ int ext4_map_blocks(handle_t *handle, struct inode *inode,
        down_write(&EXT4_I(inode)->i_data_sem);
        retval = ext4_map_create_blocks(handle, inode, map, flags);
        up_write((&EXT4_I(inode)->i_data_sem));
-       if (retval > 0 && map->m_flags & EXT4_MAP_MAPPED) {
+
+       if (retval < 0)
+               ext_debug(inode, "failed with err %d\n", retval);
+       if (retval <= 0)
+               return retval;
+
+       if (map->m_flags & EXT4_MAP_MAPPED) {
                ret = check_block_validity(inode, map);
                if (ret != 0)
                        return ret;
@@ -845,12 +851,8 @@ int ext4_map_blocks(handle_t *handle, struct inode *inode,
                                return ret;
                }
        }
-       if (retval > 0 && (map->m_flags & EXT4_MAP_UNWRITTEN ||
-                               map->m_flags & EXT4_MAP_MAPPED))
-               ext4_fc_track_range(handle, inode, map->m_lblk,
-                                       map->m_lblk + map->m_len - 1);
-       if (retval < 0)
-               ext_debug(inode, "failed with err %d\n", retval);
+       ext4_fc_track_range(handle, inode, map->m_lblk, map->m_lblk +
+                           map->m_len - 1);
        return retval;
 }