From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 A82DF292B54 for ; Fri, 15 May 2026 15:07:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778857651; cv=none; b=ZhIeCVygXMetsvplejAgGSbY7FoTEtNID+lheAbScmcfMYWFs0je1f6wXEIO7YBsHdGrEMdjgiBufAmRBMR1c548Ie+NLupvTWsFZ/mLA/bFCr5ec0fLon0tlWeY1tqPcib4zbWpTbBHAFhavRPmlNHmfO40KeJkEJqM99tovYo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778857651; c=relaxed/simple; bh=SYfdAI7LpD4zn4Z6ZMNcjzw/B5R16dCJJzIrov7NxGQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cv36KEfc4+P2N7eccN37jMGGYJMWFfDrbg0lY99o6C4avkot39+0RpLmUlV4xJl87sv8aWzVcaCbkIxo5CPRXbm6B86NYMu8PYmiY99MFLg8f7SIDgR7Yt1a2i8nWxdwFlYo6Fg/Z2dUMTAFpY8uNvt7GWv2kMk4jMopwEGAOcY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DPBhkh8K; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="DPBhkh8K" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B98F8C2BCB0; Fri, 15 May 2026 15:07:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778857651; bh=SYfdAI7LpD4zn4Z6ZMNcjzw/B5R16dCJJzIrov7NxGQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DPBhkh8KXsFI8Rsh69/TZskJoVsnoe6qvWH/TMe3q0AwZgDDMGAPJH7OtxkS6G1QF biRvYB7FWdSX7T07uqOUy/KHV7cBaNl0rBBEywUXfmmcKjSUO6A1Dih7XAtPNqsgtO PS10DtMDJcAC5rFHtRsETK5ELFXkC0fmQBlPLKvyDf0BYAsXn0oXlYGJ9IRg/Itkb5 pTK8gv9E7y+CAaaULyGzQ6VfutXSNORQ0QaWwa3DQzKt38VpXR4ftRiHXe4EZg3zBI 0SSBaqi11PnHdgg0P2yrzHh8/4jfLQH+T4Gp4LEVIrj+oOQWZB26l+MTsSjL0FKLfF De+7wUS18LuJA== From: Sasha Levin To: stable@vger.kernel.org Cc: Filipe Manana , Johannes Thumshirn , David Sterba , Sasha Levin Subject: [PATCH 6.1.y 1/2] btrfs: remove fs_info argument from btrfs_sysfs_add_space_info_type() Date: Fri, 15 May 2026 11:07:27 -0400 Message-ID: <20260515150728.3262445-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051235-backboard-scallion-e606@gregkh> References: <2026051235-backboard-scallion-e606@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Filipe Manana [ Upstream commit 771af6ff72e0ed0eb8bf97e5ae4fa5094e0c5d1d ] 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: a7449edf9614 ("btrfs: fix double free in create_space_info_sub_group() error path") Signed-off-by: Sasha Levin --- fs/btrfs/space-info.c | 4 ++-- fs/btrfs/sysfs.c | 5 ++--- fs/btrfs/sysfs.h | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c index 2f23bbcbd2316..71d3ecd4849c4 100644 --- a/fs/btrfs/space-info.c +++ b/fs/btrfs/space-info.c @@ -259,7 +259,7 @@ static int create_space_info_sub_group(struct btrfs_space_info *parent, u64 flag sub_group->parent = parent; sub_group->subgroup_id = id; - ret = btrfs_sysfs_add_space_info_type(fs_info, sub_group); + ret = btrfs_sysfs_add_space_info_type(sub_group); if (ret) { kfree(sub_group); parent->sub_group[index] = NULL; @@ -288,7 +288,7 @@ static int create_space_info(struct btrfs_fs_info *info, u64 flags) goto out_free; } - ret = btrfs_sysfs_add_space_info_type(info, space_info); + ret = btrfs_sysfs_add_space_info_type(space_info); if (ret) goto out_free; diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c index 693ae78705684..2d911adc06f62 100644 --- a/fs/btrfs/sysfs.c +++ b/fs/btrfs/sysfs.c @@ -1618,13 +1618,12 @@ static const char *alloc_name(struct btrfs_space_info *space_info) * Create a sysfs entry for a space info type at path * /sys/fs/btrfs/UUID/allocation/TYPE */ -int btrfs_sysfs_add_space_info_type(struct btrfs_fs_info *fs_info, - struct btrfs_space_info *space_info) +int btrfs_sysfs_add_space_info_type(struct btrfs_space_info *space_info) { int ret; ret = kobject_init_and_add(&space_info->kobj, &space_info_ktype, - fs_info->space_info_kobj, "%s", + space_info->fs_info->space_info_kobj, "%s", alloc_name(space_info)); if (ret) { kobject_put(&space_info->kobj); diff --git a/fs/btrfs/sysfs.h b/fs/btrfs/sysfs.h index bacef43f72672..c87a736b5cceb 100644 --- a/fs/btrfs/sysfs.h +++ b/fs/btrfs/sysfs.h @@ -28,8 +28,7 @@ void __cold btrfs_exit_sysfs(void); int btrfs_sysfs_add_mounted(struct btrfs_fs_info *fs_info); void btrfs_sysfs_remove_mounted(struct btrfs_fs_info *fs_info); void btrfs_sysfs_add_block_group_type(struct btrfs_block_group *cache); -int btrfs_sysfs_add_space_info_type(struct btrfs_fs_info *fs_info, - struct btrfs_space_info *space_info); +int btrfs_sysfs_add_space_info_type(struct btrfs_space_info *space_info); void btrfs_sysfs_remove_space_info(struct btrfs_space_info *space_info); void btrfs_sysfs_update_devid(struct btrfs_device *device); -- 2.53.0