| Message ID | 20240102123918.799062-7-yi.zhang@huaweicloud.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | ext4: use iomap for regular file's buffered IO path and enable large foilo | expand |
On Tue 02-01-24 20:38:59, Zhang Yi wrote: > From: Zhang Yi <yi.zhang@huawei.com> > > 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> Looks good to me. Feel free to add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > fs/ext4/inode.c | 32 +++----------------------------- > 1 file changed, 3 insertions(+), 29 deletions(-) > > diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c > index c141bf6d8db2..0458d7f0c059 100644 > --- a/fs/ext4/inode.c > +++ b/fs/ext4/inode.c > @@ -3261,6 +3261,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; > @@ -3423,35 +3426,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; > > @@ -3492,13 +3471,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; > } > -- > 2.39.2 >
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index c141bf6d8db2..0458d7f0c059 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3261,6 +3261,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; @@ -3423,35 +3426,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; @@ -3492,13 +3471,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; }