From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0F8DF36215E; Thu, 20 Aug 2026 15:17:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787239080; cv=none; b=YCYWKXhheQsZZeTTaeLcSgnLM9Dn5Q4/OU+dQimuHhVupIhitptB2rZSqZwYoumggOlvs2OTPXcDzaRg3vdbV5GmKxuF1PrU7wWwQ6UlxsNQXu7srVt8HcnH2IIcx/wM90rFQs8WsF6J06RH76LLHoHphvCjKQxZewOtxtFP398= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787239080; c=relaxed/simple; bh=FVT6sCc61/2MXp/BEG3yqygsv0HajWr1ePoixuaeVgw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=l33bsfmjfmqBvZ8Fx0aMzbXrVuzAqyhdWNtqwBGBW3vcfqAiFgY9ugHV2mz4y5XFc7vQ79Fb7ecYiWKunaP6ZRQIT1sm2TsukYmhJWINYOXd87ko/r9U6LL4ePBfrGnuoHO1Xpr8JsnefBRjULjQXrb1d7Ooaxfh17S6A5HvmA8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=SqvTiqLM; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="SqvTiqLM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D77DA1F000E9; Thu, 20 Aug 2026 15:17:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1787239077; bh=0ETpqXSXWpehKeTISZxB1uI4N69XI/0h96E3xSvDht0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=SqvTiqLMNnnsEkf7cOVg7Ad0W+KMnj6IBxlith/JCwSahXPNjCO3PUL71j08vKKQy U4gdd3Y3R6Zzfji1a3ztNPXEs16nVXQq4cg+mNAfxwCuh+qVGq3erW9PkbIZmLz1OE OnUxexCrObLXO1JgKa1g0cKqd+orwUY8acaqvNtA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Johannes Thumshirn , Filipe Manana , David Sterba , Sasha Levin Subject: [PATCH 6.18 142/217] btrfs: remove fs_info argument from btrfs_zoned_activate_one_bg() Date: Thu, 20 Aug 2026 16:55:10 +0200 Message-ID: <20260820145242.029019797@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260820145237.531699751@linuxfoundation.org> References: <20260820145237.531699751@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Filipe Manana [ Upstream commit a232ff90d14657c8637c6e94b606bb5d700a2ecb ] We don't need it since we can grab fs_info from the given space_info. So remove the fs_info argument. Reviewed-by: Johannes Thumshirn Signed-off-by: Filipe Manana Reviewed-by: David Sterba Signed-off-by: David Sterba Stable-dep-of: 8bc4d7209611 ("btrfs: zoned: fix missing chunk metadata reservation") Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/block-group.c | 4 ++-- fs/btrfs/zoned.c | 5 ++--- fs/btrfs/zoned.h | 6 ++---- 3 files changed, 6 insertions(+), 9 deletions(-) --- a/fs/btrfs/block-group.c +++ b/fs/btrfs/block-group.c @@ -3073,7 +3073,7 @@ int btrfs_inc_block_group_ro(struct btrf * We have allocated a new chunk. We also need to activate that chunk to * grant metadata tickets for zoned filesystem. */ - ret = btrfs_zoned_activate_one_bg(fs_info, space_info, true); + ret = btrfs_zoned_activate_one_bg(space_info, true); if (ret < 0) goto out; @@ -4354,7 +4354,7 @@ static void reserve_chunk_space(struct b * We have a new chunk. We also need to activate it for * zoned filesystem. */ - ret = btrfs_zoned_activate_one_bg(fs_info, info, true); + ret = btrfs_zoned_activate_one_bg(info, true); if (ret < 0) return; --- a/fs/btrfs/zoned.c +++ b/fs/btrfs/zoned.c @@ -2963,10 +2963,9 @@ int btrfs_zone_finish_one_bg(struct btrf return ret < 0 ? ret : 1; } -int btrfs_zoned_activate_one_bg(struct btrfs_fs_info *fs_info, - struct btrfs_space_info *space_info, - bool do_finish) +int btrfs_zoned_activate_one_bg(struct btrfs_space_info *space_info, bool do_finish) { + struct btrfs_fs_info *fs_info = space_info->fs_info; struct btrfs_block_group *bg; int index; --- a/fs/btrfs/zoned.h +++ b/fs/btrfs/zoned.h @@ -93,8 +93,7 @@ bool btrfs_zoned_should_reclaim(const st void btrfs_zoned_release_data_reloc_bg(struct btrfs_fs_info *fs_info, u64 logical, u64 length); int btrfs_zone_finish_one_bg(struct btrfs_fs_info *fs_info); -int btrfs_zoned_activate_one_bg(struct btrfs_fs_info *fs_info, - struct btrfs_space_info *space_info, bool do_finish); +int btrfs_zoned_activate_one_bg(struct btrfs_space_info *space_info, bool do_finish); void btrfs_check_active_zone_reservation(struct btrfs_fs_info *fs_info); int btrfs_reset_unused_block_groups(struct btrfs_space_info *space_info, u64 num_bytes); #else /* CONFIG_BLK_DEV_ZONED */ @@ -261,8 +260,7 @@ static inline int btrfs_zone_finish_one_ return 1; } -static inline int btrfs_zoned_activate_one_bg(struct btrfs_fs_info *fs_info, - struct btrfs_space_info *space_info, +static inline int btrfs_zoned_activate_one_bg(struct btrfs_space_info *space_info, bool do_finish) { /* Consider all the block groups are active */