diff options
author | Johannes Thumshirn <johannes.thumshirn@wdc.com> | 2021-12-07 15:28:35 +0100 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2022-01-07 14:18:25 +0100 |
commit | 8fdf54fe69a7a0f11542c2dd322b590a5b935918 (patch) | |
tree | 03c20d74cb0d4a063b38f8a368293869f6901a89 /fs/btrfs/zoned.c | |
parent | btrfs: zoned: encapsulate inode locking for zoned relocation (diff) | |
download | linux-8fdf54fe69a7a0f11542c2dd322b590a5b935918.tar.xz linux-8fdf54fe69a7a0f11542c2dd322b590a5b935918.zip |
btrfs: zoned: simplify btrfs_check_meta_write_pointer
btrfs_check_meta_write_pointer() will always be called with a NULL
'cache_ret' argument.
As there's no need to check if we have a valid block_group passed in
remove these checks.
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/zoned.c')
-rw-r--r-- | fs/btrfs/zoned.c | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c index 5ef430f02fd2..767ff6cffeae 100644 --- a/fs/btrfs/zoned.c +++ b/fs/btrfs/zoned.c @@ -1637,29 +1637,19 @@ bool btrfs_check_meta_write_pointer(struct btrfs_fs_info *fs_info, if (!btrfs_is_zoned(fs_info)) return true; - cache = *cache_ret; + cache = btrfs_lookup_block_group(fs_info, eb->start); + if (!cache) + return true; - if (cache && (eb->start < cache->start || - cache->start + cache->length <= eb->start)) { + if (cache->meta_write_pointer != eb->start) { btrfs_put_block_group(cache); cache = NULL; - *cache_ret = NULL; + ret = false; + } else { + cache->meta_write_pointer = eb->start + eb->len; } - if (!cache) - cache = btrfs_lookup_block_group(fs_info, eb->start); - - if (cache) { - if (cache->meta_write_pointer != eb->start) { - btrfs_put_block_group(cache); - cache = NULL; - ret = false; - } else { - cache->meta_write_pointer = eb->start + eb->len; - } - - *cache_ret = cache; - } + *cache_ret = cache; return ret; } |