Skip to content

Commit 8fdf54f

Browse files
morbidrsakdave
authored andcommitted
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 <[email protected]> Signed-off-by: Johannes Thumshirn <[email protected]> Reviewed-by: David Sterba <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 869f4cd commit 8fdf54f

File tree

1 file changed

+8
-18
lines changed

1 file changed

+8
-18
lines changed

fs/btrfs/zoned.c

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1637,29 +1637,19 @@ bool btrfs_check_meta_write_pointer(struct btrfs_fs_info *fs_info,
16371637
if (!btrfs_is_zoned(fs_info))
16381638
return true;
16391639

1640-
cache = *cache_ret;
1640+
cache = btrfs_lookup_block_group(fs_info, eb->start);
1641+
if (!cache)
1642+
return true;
16411643

1642-
if (cache && (eb->start < cache->start ||
1643-
cache->start + cache->length <= eb->start)) {
1644+
if (cache->meta_write_pointer != eb->start) {
16441645
btrfs_put_block_group(cache);
16451646
cache = NULL;
1646-
*cache_ret = NULL;
1647+
ret = false;
1648+
} else {
1649+
cache->meta_write_pointer = eb->start + eb->len;
16471650
}
16481651

1649-
if (!cache)
1650-
cache = btrfs_lookup_block_group(fs_info, eb->start);
1651-
1652-
if (cache) {
1653-
if (cache->meta_write_pointer != eb->start) {
1654-
btrfs_put_block_group(cache);
1655-
cache = NULL;
1656-
ret = false;
1657-
} else {
1658-
cache->meta_write_pointer = eb->start + eb->len;
1659-
}
1660-
1661-
*cache_ret = cache;
1662-
}
1652+
*cache_ret = cache;
16631653

16641654
return ret;
16651655
}

0 commit comments

Comments
 (0)