From: Johannes Thumshirn johannes.thumshirn@wdc.com
commit e380adfc213a13677993c0e35cb48f5a8e61ebb0 upstream.
btrfs_use_zone_append only needs the passed in extent_map's block_start member, so there's no need to pass in the full extent map.
This also enables the use of btrfs_use_zone_append in places where we only have a start byte but no extent_map.
Signed-off-by: Johannes Thumshirn johannes.thumshirn@wdc.com Reviewed-by: David Sterba dsterba@suse.com Signed-off-by: David Sterba dsterba@suse.com Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- fs/btrfs/extent_io.c | 2 +- fs/btrfs/inode.c | 2 +- fs/btrfs/zoned.c | 4 ++-- fs/btrfs/zoned.h | 5 ++--- 4 files changed, 6 insertions(+), 7 deletions(-)
--- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -3762,7 +3762,7 @@ static noinline_for_stack int __extent_w /* Note that em_end from extent_map_end() is exclusive */ iosize = min(em_end, end + 1) - cur;
- if (btrfs_use_zone_append(inode, em)) + if (btrfs_use_zone_append(inode, em->block_start)) opf = REQ_OP_ZONE_APPEND;
free_extent_map(em); --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -7782,7 +7782,7 @@ static int btrfs_dio_iomap_begin(struct iomap->bdev = fs_info->fs_devices->latest_bdev; iomap->length = len;
- if (write && btrfs_use_zone_append(BTRFS_I(inode), em)) + if (write && btrfs_use_zone_append(BTRFS_I(inode), em->block_start)) iomap->flags |= IOMAP_F_ZONE_APPEND;
free_extent_map(em); --- a/fs/btrfs/zoned.c +++ b/fs/btrfs/zoned.c @@ -1278,7 +1278,7 @@ void btrfs_free_redirty_list(struct btrf spin_unlock(&trans->releasing_ebs_lock); }
-bool btrfs_use_zone_append(struct btrfs_inode *inode, struct extent_map *em) +bool btrfs_use_zone_append(struct btrfs_inode *inode, u64 start) { struct btrfs_fs_info *fs_info = inode->root->fs_info; struct btrfs_block_group *cache; @@ -1293,7 +1293,7 @@ bool btrfs_use_zone_append(struct btrfs_ if (!is_data_inode(&inode->vfs_inode)) return false;
- cache = btrfs_lookup_block_group(fs_info, em->block_start); + cache = btrfs_lookup_block_group(fs_info, start); ASSERT(cache); if (!cache) return false; --- a/fs/btrfs/zoned.h +++ b/fs/btrfs/zoned.h @@ -47,7 +47,7 @@ void btrfs_calc_zone_unusable(struct btr void btrfs_redirty_list_add(struct btrfs_transaction *trans, struct extent_buffer *eb); void btrfs_free_redirty_list(struct btrfs_transaction *trans); -bool btrfs_use_zone_append(struct btrfs_inode *inode, struct extent_map *em); +bool btrfs_use_zone_append(struct btrfs_inode *inode, u64 start); void btrfs_record_physical_zoned(struct inode *inode, u64 file_offset, struct bio *bio); void btrfs_rewrite_logical_zoned(struct btrfs_ordered_extent *ordered); @@ -146,8 +146,7 @@ static inline void btrfs_redirty_list_ad struct extent_buffer *eb) { } static inline void btrfs_free_redirty_list(struct btrfs_transaction *trans) { }
-static inline bool btrfs_use_zone_append(struct btrfs_inode *inode, - struct extent_map *em) +static inline bool btrfs_use_zone_append(struct btrfs_inode *inode, u64 start) { return false; }