Commit 34c9e7dc authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Long Li
Browse files

btrfs: zoned: factor out single bg handling from btrfs_load_block_group_zone_info 

mainline inclusion
from mainline-v6.6-rc5
commit 9e0e3e74dc6928a0956f4e27e24d473c65887e96
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IACZX0
CVE: CVE-2024-39496

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=9e0e3e74dc6928a0956f4e27e24d473c65887e96



--------------------------------

Split the code handling a type single block group from
btrfs_load_block_group_zone_info to make the code more readable.

Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarLong Li <leo.lilong@huawei.com>
parent d3e54e91

fs/btrfs/zoned.c

+19 −11
Original line number Diff line number Diff line
@@ -1374,6 +1374,24 @@ static int btrfs_load_zone_info(struct btrfs_fs_info *fs_info, int zone_idx, 
	return 0;

}



static int btrfs_load_block_group_single(struct btrfs_block_group *bg,

					 struct zone_info *info,

					 unsigned long *active)

{

	if (info->alloc_offset == WP_MISSING_DEV) {

		btrfs_err(bg->fs_info,

			"zoned: cannot recover write pointer for zone %llu",

			info->physical);

		return -EIO;

	}



	bg->alloc_offset = info->alloc_offset;

	bg->zone_capacity = info->capacity;

	if (test_bit(0, active))

		set_bit(BLOCK_GROUP_FLAG_ZONE_IS_ACTIVE, &bg->runtime_flags);

	return 0;

}



int btrfs_load_block_group_zone_info(struct btrfs_block_group *cache, bool new)

{

	struct btrfs_fs_info *fs_info = cache->fs_info;
@@ -1460,17 +1478,7 @@ int btrfs_load_block_group_zone_info(struct btrfs_block_group *cache, bool new) 


	switch (map->type & BTRFS_BLOCK_GROUP_PROFILE_MASK) {

	case 0: /* single */

		if (zone_info[0].alloc_offset == WP_MISSING_DEV) {

			btrfs_err(fs_info,

			"zoned: cannot recover write pointer for zone %llu",

				zone_info[0].physical);

			ret = -EIO;

			goto out;

		}

		cache->alloc_offset = zone_info[0].alloc_offset;

		cache->zone_capacity = zone_info[0].capacity;

		if (test_bit(0, active))

			set_bit(BLOCK_GROUP_FLAG_ZONE_IS_ACTIVE, &cache->runtime_flags);

		ret = btrfs_load_block_group_single(cache, &zone_info[0], active);

		break;

	case BTRFS_BLOCK_GROUP_DUP:

		if (map->type & BTRFS_BLOCK_GROUP_DATA) {