diff options
| author | Naohiro Aota <naohiro.aota@wdc.com> | 2022-05-03 17:48:50 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-08-17 14:42:26 +0200 |
| commit | 9c8c62cccf748ff059a7586b01779841effff204 (patch) | |
| tree | e52215994ad53032bc2579a8a7b4a0b5d48b34d5 | |
| parent | a47b7208ceabcff7e269b9efd69c7f0d23577d9b (diff) | |
btrfs: zoned: introduce btrfs_zoned_bg_is_full
[ Upstream commit 1bfd476754a2d63f899ef9c3e253b17766b8fb73 ]
Introduce a wrapper to check if all the space in a block group is
allocated or not.
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | fs/btrfs/extent-tree.c | 3 | ||||
| -rw-r--r-- | fs/btrfs/zoned.c | 2 | ||||
| -rw-r--r-- | fs/btrfs/zoned.h | 6 |
3 files changed, 8 insertions, 3 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index bdebd77f31b4..56185541e188 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -3803,8 +3803,7 @@ static int do_allocation_zoned(struct btrfs_block_group *block_group, /* Check RO and no space case before trying to activate it */ spin_lock(&block_group->lock); - if (block_group->ro || - block_group->alloc_offset == block_group->zone_capacity) { + if (block_group->ro || btrfs_zoned_bg_is_full(block_group)) { ret = 1; /* * May need to clear fs_info->{treelog,data_reloc}_bg. diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c index 0a6a3d6f5af7..170681797283 100644 --- a/fs/btrfs/zoned.c +++ b/fs/btrfs/zoned.c @@ -1859,7 +1859,7 @@ bool btrfs_zone_activate(struct btrfs_block_group *block_group) } /* No space left */ - if (block_group->alloc_offset == block_group->zone_capacity) { + if (btrfs_zoned_bg_is_full(block_group)) { ret = false; goto out_unlock; } diff --git a/fs/btrfs/zoned.h b/fs/btrfs/zoned.h index 199b69670fa2..0740458894ac 100644 --- a/fs/btrfs/zoned.h +++ b/fs/btrfs/zoned.h @@ -384,4 +384,10 @@ static inline void btrfs_zoned_data_reloc_unlock(struct btrfs_inode *inode) mutex_unlock(&root->fs_info->zoned_data_reloc_io_lock); } +static inline bool btrfs_zoned_bg_is_full(const struct btrfs_block_group *bg) +{ + ASSERT(btrfs_is_zoned(bg->fs_info)); + return (bg->alloc_offset == bg->zone_capacity); +} + #endif |