nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

btrfs: zoned: pass start block to btrfs_use_zone_append

Browse source 
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>
This commit is contained in:
Johannes Thumshirn 2021-05-19 00:40:27 +09:00 committed by David Sterba
parent 91df99a6eb
commit e380adfc21
4 changed files with 6 additions and 7 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
fs/btrfs/extent_io.c
View file

@ -3762,7 +3762,7 @@ static noinline_for_stack int __extent_writepage_io(struct btrfs_inode *inode,
/* Note that em_end from extent_map_end() is exclusive */ /* Note that em_end from extent_map_end() is exclusive */
iosize = min(em_end, end + 1) - cur; 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; opf = REQ_OP_ZONE_APPEND;
free_extent_map(em); free_extent_map(em);

2
fs/btrfs/inode.c
View file

@ -7796,7 +7796,7 @@ static int btrfs_dio_iomap_begin(struct inode *inode, loff_t start,
iomap->bdev = fs_info->fs_devices->latest_bdev; iomap->bdev = fs_info->fs_devices->latest_bdev;
iomap->length = len; 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; iomap->flags |= IOMAP_F_ZONE_APPEND;
free_extent_map(em); free_extent_map(em);

4
fs/btrfs/zoned.c
View file

@ -1278,7 +1278,7 @@ void btrfs_free_redirty_list(struct btrfs_transaction *trans)
spin_unlock(&trans->releasing_ebs_lock); 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_fs_info *fs_info = inode->root->fs_info;
struct btrfs_block_group *cache; struct btrfs_block_group *cache;
@ -1293,7 +1293,7 @@ bool btrfs_use_zone_append(struct btrfs_inode *inode, struct extent_map *em)
if (!is_data_inode(&inode->vfs_inode)) if (!is_data_inode(&inode->vfs_inode))
return false; return false;
cache = btrfs_lookup_block_group(fs_info, em->block_start); cache = btrfs_lookup_block_group(fs_info, start);
ASSERT(cache); ASSERT(cache);
if (!cache) if (!cache)
return false; return false;

5
fs/btrfs/zoned.h
View file

@ -53,7 +53,7 @@ void btrfs_calc_zone_unusable(struct btrfs_block_group *cache);
void btrfs_redirty_list_add(struct btrfs_transaction *trans, void btrfs_redirty_list_add(struct btrfs_transaction *trans,
struct extent_buffer *eb); struct extent_buffer *eb);
void btrfs_free_redirty_list(struct btrfs_transaction *trans); 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, void btrfs_record_physical_zoned(struct inode *inode, u64 file_offset,
struct bio *bio); struct bio *bio);
void btrfs_rewrite_logical_zoned(struct btrfs_ordered_extent *ordered); void btrfs_rewrite_logical_zoned(struct btrfs_ordered_extent *ordered);
@ -152,8 +152,7 @@ static inline void btrfs_redirty_list_add(struct btrfs_transaction *trans,
struct extent_buffer *eb) { } struct extent_buffer *eb) { }
static inline void btrfs_free_redirty_list(struct btrfs_transaction *trans) { } static inline void btrfs_free_redirty_list(struct btrfs_transaction *trans) { }
static inline bool btrfs_use_zone_append(struct btrfs_inode *inode, static inline bool btrfs_use_zone_append(struct btrfs_inode *inode, u64 start)
struct extent_map *em)
{ {
return false; return false;
} }