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 27330233707; Mon, 2 Jun 2025 14:52:50 +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=1748875970; cv=none; b=cNUBiroC56glEGlVMFsOxghmxs3O5gK5PLOca3Kkk7j0hkBnrqWsJTccGq8KoWHP33Nz2J4n6TfMo8XtxJCEKCaclPuE2I219UcwAOfUwinNQOkPg18/YZtvqLbK7s2l9prHseT8yu6nHw314XrKhsAvzpTs2UGXWRATOHCrC+4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748875970; c=relaxed/simple; bh=ygpdVUGxGaE1immIxmAhPfLc/jykg8uXLka6PEDPO7s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Zsiu+8tLiH1EgkRQryt9YyZ2euLdlFsrhgeqOJoP+33za6mzoEnuT62TKdRBPRIMdW8jftspmLkuNdsmzooUy6ffIVtC4EV/2Ka2EldzfhTkXJUfgLSugAyG6OqXBqe7FFiO3FHI/84ccGuJei9TxPed6tDF5uuNiMpCG13LEa8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gJbuLsR8; 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="gJbuLsR8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 89946C4CEEE; Mon, 2 Jun 2025 14:52:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748875970; bh=ygpdVUGxGaE1immIxmAhPfLc/jykg8uXLka6PEDPO7s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gJbuLsR8X3HF81WWyhjgHTkcPLwFRurJ6fglNFKRt1qb/C0+C1i8wJyvo9VziH3pB godfH7knDhTBY2txmDwLITv1GR0qG0g3ULS798IVxgHvaMrvxh+itZz7932n+BWSXv kyCOxhk1EalnH7CAJUFhmXnVOyo2KlbUOK7LJa3A= 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 5.15 031/207] btrfs: avoid linker error in btrfs_find_create_tree_block() Date: Mon, 2 Jun 2025 15:46:43 +0200 Message-ID: <20250602134259.984801433@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602134258.769974467@linuxfoundation.org> References: <20250602134258.769974467@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-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 a1946d62911c9..39619fd6d6aae 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -6024,10 +6024,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; @@ -6063,8 +6063,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