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 EF6F947ECD0 for ; Fri, 15 May 2026 12:15:30 +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=1778847331; cv=none; b=oA3iCqDKsMaIaZ23QvKeIDQ1WdR7GSd08XKoFoaTDk9Ue2iNlBdhcIVvEAA/YcWQ5enu6KVd1U0lWDeD46wxw4NeNDYjrNZPrYvekRIrENEZB8pOCpzL226AgPdvquvevsmThBRFKFKx5gc79152wWKIDRq1945YMSZ6UBMwQNk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778847331; c=relaxed/simple; bh=UtaIFRI3aWnYM0U65Zw5vkrDA/YM4S6SIsKkmWeOOLQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LZj6oj1WBPHUHyaW9njAvXXtwm1KHZGigWnkpFrsKLyiX1/qBDd8P4Gmx6aeOCxG6e3HvH/cNRkCAFHB3qcPora1HDEq/CyukWp2P5G7Tu+j74mAnhu1ldNgY9gwinMNufN2vSkNQwovrzM5Tot+PPcHXw+e5zLFEeRgFfY8OZg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Lhlyflm4; 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="Lhlyflm4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F29C2C2BCB7; Fri, 15 May 2026 12:15:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778847330; bh=UtaIFRI3aWnYM0U65Zw5vkrDA/YM4S6SIsKkmWeOOLQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Lhlyflm4mgbMTnn+vnn2wy4iWRTkuIiLZfsJ9dQ/pMDmYBM0+A+MNedrid/YFlbre DBsNqwtc/K1U05g702sHJtQMvwRn6Hqy9ncVQ90zLiQ2X5wSpcapAWIsr92yrG+qj+ ITmlqTHLDoN3BIXs9E7v0VPWmEOj2/s9HfSqsLrt9YdL9SvCf7GmeCvmDs5XgGDEsU fD3yMkuIHLKEInNXCLqsfVIroYUou71UzIDE9WpRp9xgjYSrzY0+RDNo2ZA3sL1qaP s7GnKt2tuaTnFZ7PkDsMH9cAVLl0kxIPziLwsgUthjMxEqEY1ZKFtDp7HeIVS/jcMN puJzA7bEhnHxg== From: Sasha Levin To: stable@vger.kernel.org Cc: Filipe Manana , Johannes Thumshirn , David Sterba , Sasha Levin Subject: [PATCH 6.12.y 1/2] btrfs: remove fs_info argument from btrfs_sysfs_add_space_info_type() Date: Fri, 15 May 2026 08:15:27 -0400 Message-ID: <20260515121528.3130102-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051235-rockband-barrel-a707@gregkh> References: <2026051235-rockband-barrel-a707@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 7da0e739762af..d059bf5eaa098 100644 --- a/fs/btrfs/space-info.c +++ b/fs/btrfs/space-info.c @@ -265,7 +265,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; @@ -294,7 +294,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) return ret; diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c index ea13e3eee7d90..8f195e769ecf0 100644 --- a/fs/btrfs/sysfs.c +++ b/fs/btrfs/sysfs.c @@ -1825,13 +1825,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 e6a284c59809c..ec834a4af2e5d 100644 --- a/fs/btrfs/sysfs.h +++ b/fs/btrfs/sysfs.h @@ -36,8 +36,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