Skip to content

Commit a927242

Browse files
Yang Erkuntytso
authored andcommitted
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>
1 parent dac0921 commit a927242

1 file changed

Lines changed: 9 additions & 7 deletions

File tree

fs/ext4/inode.c

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,13 @@ int ext4_map_blocks(handle_t *handle, struct inode *inode,
816816
down_write(&EXT4_I(inode)->i_data_sem);
817817
retval = ext4_map_create_blocks(handle, inode, map, flags);
818818
up_write((&EXT4_I(inode)->i_data_sem));
819-
if (retval > 0 && map->m_flags & EXT4_MAP_MAPPED) {
819+
820+
if (retval < 0)
821+
ext_debug(inode, "failed with err %d\n", retval);
822+
if (retval <= 0)
823+
return retval;
824+
825+
if (map->m_flags & EXT4_MAP_MAPPED) {
820826
ret = check_block_validity(inode, map);
821827
if (ret != 0)
822828
return ret;
@@ -845,12 +851,8 @@ int ext4_map_blocks(handle_t *handle, struct inode *inode,
845851
return ret;
846852
}
847853
}
848-
if (retval > 0 && (map->m_flags & EXT4_MAP_UNWRITTEN ||
849-
map->m_flags & EXT4_MAP_MAPPED))
850-
ext4_fc_track_range(handle, inode, map->m_lblk,
851-
map->m_lblk + map->m_len - 1);
852-
if (retval < 0)
853-
ext_debug(inode, "failed with err %d\n", retval);
854+
ext4_fc_track_range(handle, inode, map->m_lblk, map->m_lblk +
855+
map->m_len - 1);
854856
return retval;
855857
}
856858

0 commit comments

Comments
 (0)