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 6E39127D776; Tue, 27 May 2025 17:24:06 +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=1748366646; cv=none; b=fqghGkFF6MSmqQvkxtGveg3AkKOWwUVNIXU4DEoujy1G2HQ276wz9BHY4pUd3/xBz1lbCAan0JITq6LPaUI7vndyNQ/HVSht0OwoqxAq7l4zHEFpTwOUdL5mKEtvLgptN7eu12dADyf9yT0jYge3vZc3Mc+FXYtuApgk8V8U/UE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748366646; c=relaxed/simple; bh=oAi01EPGXXAg+vawP41tNTX7V/aabGNs7F+r0GP3bWE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cGjvNPS10b1paAHdignmncSyGnVb6w2wlRROE9TA7/QrBAxujYmRIadSDaTAx5g6aWFKp0MCVUBZnyu2TYP3ASfHe1VAz4Dml51t71hZjKYJaNRoNs+drRXrYdr2NKVKh6dipnj3DqVmFfn8H24vEFt6fQStX9qyhmhebeyoRJ8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=HQ98cyEn; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="HQ98cyEn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 002E1C4CEE9; Tue, 27 May 2025 17:24:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748366646; bh=oAi01EPGXXAg+vawP41tNTX7V/aabGNs7F+r0GP3bWE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HQ98cyEnch4BKdYdc0vME9Oi75gQWSkWwwanjIR2oOT5JFPzGtFbYFCZeWNIA4Oww kdy+xm6AV4ScPsgZiQVSfkigEmwpQeL5m0Taq3bXIAZcS1EGxpCLupaIwgpEPz9fb6 82HMbJ9ThzPV+99A3MFsAQzEJpy2kDpzX9I3Vpy4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Qu Wenruo , Mark Harmstone , David Sterba , Sasha Levin Subject: [PATCH 6.14 135/783] btrfs: avoid linker error in btrfs_find_create_tree_block() Date: Tue, 27 May 2025 18:18:52 +0200 Message-ID: <20250527162518.652236987@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250527162513.035720581@linuxfoundation.org> References: <20250527162513.035720581@linuxfoundation.org> User-Agent: quilt/0.68 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.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mark Harmstone [ Upstream commit 7ef3cbf17d2734ca66c4ed8573be45f4e461e7ee ] The inline function btrfs_is_testing() is hardcoded to return 0 if CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set. Currently we're relying on the compiler optimizing out the call to alloc_test_extent_buffer() in btrfs_find_create_tree_block(), as it's not been defined (it's behind an #ifdef). Add a stub version of alloc_test_extent_buffer() to avoid linker errors on non-standard optimization levels. This problem was seen on GCC 14 with -O0 and is helps to see symbols that would be otherwise optimized out. Reviewed-by: Qu Wenruo Signed-off-by: Mark Harmstone Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/extent_io.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index c021aae8875eb..06922529f19dc 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -2842,10 +2842,10 @@ struct extent_buffer *find_extent_buffer(struct btrfs_fs_info *fs_info, return eb; } -#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS struct extent_buffer *alloc_test_extent_buffer(struct btrfs_fs_info *fs_info, u64 start) { +#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS struct extent_buffer *eb, *exists = NULL; int ret; @@ -2881,8 +2881,11 @@ struct extent_buffer *alloc_test_extent_buffer(struct btrfs_fs_info *fs_info, free_eb: btrfs_release_extent_buffer(eb); return exists; -} +#else + /* Stub to avoid linker error when compiled with optimizations turned off. */ + return NULL; #endif +} static struct extent_buffer *grab_extent_buffer(struct btrfs_fs_info *fs_info, struct folio *folio) -- 2.39.5