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 4435827BF7C; Tue, 27 May 2025 16:52:04 +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=1748364725; cv=none; b=jUuQtEl2hTfM7/FfJxY0y6j/V5smpn9fQM1yon0oaIcEs5mcKRtMq8jeS5SYJcIIWDjil679t8RE0SKRCCgkj8wImKspEJLqz6sTAT/PITGzJWVh1qeSl9Fi6Ce7Vo1MpbssNkNpQQ/gm/y/al+nGlC/GTtlGS5m9muFBldlyGQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748364725; c=relaxed/simple; bh=+XIFauamf4Weru+rxUnDJttlCTTk+Fjld7nl1Oxw9I8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iq8w67iza68hktH2+rLCM7b8CBIcfdXPsm7fLpdzgv+b06SkI7TqtD4vQ+Sk7e0up5MdArVOgWpV9lsN6zpdHJyrH1i9d5Db0MA5KSb6jSDcZP6H4OLDsGVYD844pIzdI3P+75jBmjte6dASJnG2nS0Tp0kw2ZX2b7wvp0A6JXM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=HU27lDdK; 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="HU27lDdK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 50B07C4CEE9; Tue, 27 May 2025 16:52:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748364724; bh=+XIFauamf4Weru+rxUnDJttlCTTk+Fjld7nl1Oxw9I8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HU27lDdKeyt9gzI9Xpzn6f23u2V7/eeQ4DBxzVY4BXieLusSG5OVBXNmLcl+X3nE8 L/gBwqXw712H7WJ1JMQzr3fB+SJgyW3D4p5Egp1BwDLvuMIN2DM7am2LUc0DAQZ2Fp j3XudNb0ETGe0UHf2idg25Shl8DOgsD0jDNhl1OM= 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.12 115/626] btrfs: avoid linker error in btrfs_find_create_tree_block() Date: Tue, 27 May 2025 18:20:08 +0200 Message-ID: <20250527162449.708717697@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250527162445.028718347@linuxfoundation.org> References: <20250527162445.028718347@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.12-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 e263d4b0546fa..d322cf82783f9 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -2826,10 +2826,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; @@ -2865,8 +2865,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 page *page) -- 2.39.5