btrfs: balance: factor out convert profile validation (5ba366c3) · Commits · 戴 / test

fs/btrfs/volumes.c

+21 −24

Original line number	Diff line number	Diff line
		@@ -3801,13 +3801,25 @@ static inline int balance_need_close(struct btrfs_fs_info *fs_info)
		atomic_read(&fs_info->balance_cancel_req) == 0);
		}

		/* Non-zero return value signifies invalidity */
		static inline int validate_convert_profile(struct btrfs_balance_args *bctl_arg,
		u64 allowed)
		/*
		* Validate target profile against allowed profiles and return true if it's OK.
		* Otherwise print the error message and return false.
		*/
		static inline int validate_convert_profile(struct btrfs_fs_info *fs_info,
		const struct btrfs_balance_args *bargs,
		u64 allowed, const char *type)
		{
		return ((bctl_arg->flags & BTRFS_BALANCE_ARGS_CONVERT) &&
		(!alloc_profile_is_valid(bctl_arg->target, 1) \|\|
		(bctl_arg->target & ~allowed)));
		if (!(bargs->flags & BTRFS_BALANCE_ARGS_CONVERT))
		return true;

		/* Profile is valid and does not have bits outside of the allowed set */
		if (alloc_profile_is_valid(bargs->target, 1) &&
		(bargs->target & ~allowed) == 0)
		return true;

		btrfs_err(fs_info, "balance: invalid convert %s profile %s",
		type, btrfs_bg_type_to_raid_name(bargs->target));
		return false;
		}

		/*
		@@ -4023,24 +4035,9 @@ int btrfs_balance(struct btrfs_fs_info *fs_info,
		if (num_devices >= btrfs_raid_array[i].devs_min)
		allowed \|= btrfs_raid_array[i].bg_flag;

		if (validate_convert_profile(&bctl->data, allowed)) {
		btrfs_err(fs_info,
		"balance: invalid convert data profile %s",
		btrfs_bg_type_to_raid_name(bctl->data.target));
		ret = -EINVAL;
		goto out;
		}
		if (validate_convert_profile(&bctl->meta, allowed)) {
		btrfs_err(fs_info,
		"balance: invalid convert metadata profile %s",
		btrfs_bg_type_to_raid_name(bctl->meta.target));
		ret = -EINVAL;
		goto out;
		}
		if (validate_convert_profile(&bctl->sys, allowed)) {
		btrfs_err(fs_info,
		"balance: invalid convert system profile %s",
		btrfs_bg_type_to_raid_name(bctl->sys.target));
		if (!validate_convert_profile(fs_info, &bctl->data, allowed, "data") \|\|
		!validate_convert_profile(fs_info, &bctl->meta, allowed, "metadata") \|\|
		!validate_convert_profile(fs_info, &bctl->sys, allowed, "system")) {
		ret = -EINVAL;
		goto out;
		}

Admin message