Commit 8fdf54fe authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by David Sterba

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: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 869f4cdc
...@@ -1637,29 +1637,19 @@ bool btrfs_check_meta_write_pointer(struct btrfs_fs_info *fs_info, ...@@ -1637,29 +1637,19 @@ bool btrfs_check_meta_write_pointer(struct btrfs_fs_info *fs_info,
if (!btrfs_is_zoned(fs_info)) if (!btrfs_is_zoned(fs_info))
return true; return true;
cache = *cache_ret; cache = btrfs_lookup_block_group(fs_info, eb->start);
if (!cache)
return true;
if (cache && (eb->start < cache->start || if (cache->meta_write_pointer != eb->start) {
cache->start + cache->length <= eb->start)) {
btrfs_put_block_group(cache); btrfs_put_block_group(cache);
cache = NULL; cache = NULL;
*cache_ret = NULL; ret = false;
} else {
cache->meta_write_pointer = eb->start + eb->len;
} }
if (!cache) *cache_ret = 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;
}
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment