From patchwork Mon Nov 7 22:42:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 16748 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2340023wru; Mon, 7 Nov 2022 14:46:17 -0800 (PST) X-Google-Smtp-Source: AMsMyM6sPgu+RVexJeU8tCHEDMg3BYI+4EdynOICDDsKYSGawnxlleHCqNgjADuwmdS4Aol4ydmI X-Received: by 2002:a50:a698:0:b0:460:f0c0:f9c8 with SMTP id e24-20020a50a698000000b00460f0c0f9c8mr845943edc.181.1667861177313; Mon, 07 Nov 2022 14:46:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667861177; cv=none; d=google.com; s=arc-20160816; b=eJsXe9nBaGuyosI/tPmL8Bmz2GYUOUJd5YgXTCobXZF7vykT5ATJikP9CO4x4vgXIR 6gH92kXt+h9TkqQmyPiZDT/0ELeejuA3fkGbwzcTE5hbBtctCE3YqQMDncQ+sImuonsK SUK/goId7ZCFIlz/ue3qy/VF2oV2TI9wrkpTffXKWV08b9uC7yfN0b3kRe6a8BygNhAU oVXWAiNU1NEpoqdWFM/dbLHDn/Ie0kb0Jy0GaNbd6M0c8Fl9ul2Zi0Hg7bQKhjm4XEnR YxzTqfVRV0LqkWNkT1sktD2SnvPNfDDQHo215XlGfc9DNppPwN23h0oKhPKng9rmjT4J EX7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=U+kbxtJxTH9fYySssrNYMYYLIujmaNtFz3LKMtodLE0=; b=iybN/u4xQr6BT4nFZFx0tEAn5Nf+675oCIlwZwAxEeScf9dAH5PLOD9QRCUcVpFCow e24TZO48U0TQyIpkbcLNPeYhe5vS/LuHJQgrOBOFLcK2SFAYzmZswc+cnLvxC0n5m5tL CzJNxelj95iwQCPmGXoE2WrWur4Lw0cIoclq9q+S0PGKQW3PtTbQLZBf0mFU7z7RoV+h udefqBO/AUKzfNgyEEoB1mrpRQnJF/X45LqNri1SgWQMCNi7efhmxlG1b80yWann92AN 4UQv8TGNKO2UMkyptI0jAx1shrpkHtuz38z2QH6da4HZYIQ8ZhgClMf2z+kG72LepBii eoFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Q4MhUbZ6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id xh14-20020a170906da8e00b0079800b8172bsi9601020ejb.450.2022.11.07.14.45.52; Mon, 07 Nov 2022 14:46:17 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Q4MhUbZ6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231974AbiKGWml (ORCPT + 99 others); Mon, 7 Nov 2022 17:42:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231796AbiKGWmj (ORCPT ); Mon, 7 Nov 2022 17:42:39 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ECEC9205D3; Mon, 7 Nov 2022 14:42:36 -0800 (PST) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4N5mT34M5xz4xFs; Tue, 8 Nov 2022 09:42:31 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1667860951; bh=U+kbxtJxTH9fYySssrNYMYYLIujmaNtFz3LKMtodLE0=; h=Date:From:To:Cc:Subject:From; b=Q4MhUbZ6rtV7MYZbRlc8m/Go/9+1iHwlVG3PBC8B+M4n7C+JOCa1OJIqxCoaPXQzx OkpX/VjviwRrZMZurWTCOWC2T2Fc4auJA7dY+SYLrCN5q3T1eILDuOMqT4nkvnlntc W7/sFyhNTw8Omp/TDSONI1CRGckvVLVzebA9JhmK4S/PpxMPtA98O/BvVQX3bMRk37 ygXl166HbE8KH4rmGwk9aoD37Ecdp5AAWrrjzlqQLQMMCLF7IAowYM5dgzGmDtYGhl F7DD9ZRRuvxPsTltNvymMh552jB4GYoD4JtXj34m4Kt4BpUmq2ZYPAo88qaFeAjYWK y8LgQnuC8X+wQ== Date: Tue, 8 Nov 2022 09:42:29 +1100 From: Stephen Rothwell To: David Sterba Cc: David Sterba , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the btrfs tree Message-ID: <20221108094229.1b530fec@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748879201434879202?= X-GMAIL-MSGID: =?utf-8?q?1748879201434879202?= Hi all, After merging the btrfs tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: ld: fs/btrfs/messages.o:(.opd+0x90): multiple definition of `abort_should_print_stack'; fs/btrfs/ctree.o:(.opd+0x270): first defined here ld: fs/btrfs/messages.o: in function `.abort_should_print_stack': messages.c:(.text.unlikely+0x55c): multiple definition of `.abort_should_print_stack'; fs/btrfs/ctree.o:ctree.c:(.text.unlikely+0x0): first defined here Caused by commit 8bb808c6ad91 ("btrfs: don't print stack trace when transaction is aborted due to ENOMEM") from the btrfs-fixes tree interacting with commit c6f1e8101ccc ("btrfs: don't print stack trace when transaction is aborted due to ENOMEM") from the btrfs tree. I applied the following merge fix for today. From: Stephen Rothwell Date: Tue, 8 Nov 2022 09:30:57 +1100 Subject: [PATCH] btrfs: fix up for "btrfs: don't print stack trace when transaction is aborted due to ENOMEM" Signed-off-by: Stephen Rothwell --- fs/btrfs/ctree.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 2e4a7b25ba81..8443a2e42fd5 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -120,22 +120,6 @@ noinline void btrfs_release_path(struct btrfs_path *p) } } -/* - * We want the transaction abort to print stack trace only for errors where the - * cause could be a bug, eg. due to ENOSPC, and not for common errors that are - * caused by external factors. - */ -bool __cold abort_should_print_stack(int errno) -{ - switch (errno) { - case -EIO: - case -EROFS: - case -ENOMEM: - return false; - } - return true; -} - /* * safely gets a reference on the root node of a tree. A lock * is not taken, so a concurrent writer may put a different node