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 F127B1C5D72; Mon, 2 Jun 2025 14:31:23 +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=1748874684; cv=none; b=bPYGi1aQ9iB/mpYSCdKRzLFQwXqM+syqWmn1uNGaz7hz/RK1UCdVz+lJEVEPtHwifb3Iv9GusnfXm5LpIRxeuaMjPwy7h7A/niQyz4K4qFvBIUG0v4gZ425XqFbfFhbeR7FvQjUs4651pG4I1woohANkl5iyW5//UeyQbGe5pmY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748874684; c=relaxed/simple; bh=Vcu55QVeG9ufhtAtvvOv9xbt0CkdsVlb0Of7VrnSYtc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PSU5GmURb9Li7XhJ36mkoJrgakxOah9Ye+j+Z9ffehd+20zJ5i2tTTLUVq/WQyN8V2VkrGA319DRK3M0YclTAANDj+MH8hNoUGaERVQAerl7Kx2FZZSxSkFIRU9VIexudWAzq38cEpiddIJ2R1M6eKGgRL8Jep2TuPophmGuOAQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=GYg2R2t1; 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="GYg2R2t1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 500E3C4CEEB; Mon, 2 Jun 2025 14:31:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748874683; bh=Vcu55QVeG9ufhtAtvvOv9xbt0CkdsVlb0Of7VrnSYtc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GYg2R2t19z1W4GpkgtQ6ywq9vBBhvjHdeXcuOfb5+EAr/jXHG5dHzpeqgRI4ZBtdg nnl7pX9ddae+hljF08z8+BEhY3MmWvJYqFL/WELb85mYeUrtuPOhwspLmDldYrNmJV tp8Qc+oBzWIUJj0mXnYcVLk5yjMWByTbIeBnWUhQ= 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.4 101/204] btrfs: avoid linker error in btrfs_find_create_tree_block() Date: Mon, 2 Jun 2025 15:47:14 +0200 Message-ID: <20250602134259.632462185@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602134255.449974357@linuxfoundation.org> References: <20250602134255.449974357@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.4-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 04788940afafc..64af1c7f95c24 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -5134,10 +5134,10 @@ struct extent_buffer *find_extent_buffer(struct btrfs_fs_info *fs_info, return NULL; } -#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; @@ -5173,8 +5173,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 +} struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info, u64 start) -- 2.39.5