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;
Date:   Tue, 8 Nov 2022 09:42:29 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     David Sterba <dsterba@suse.cz>
Cc:     David Sterba <dsterba@suse.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the btrfs tree
Message-ID: <20221108094229.1b530fec@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/oq=4tGTJq3rnBrFV.9E+Tky";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/oq=4tGTJq3rnBrFV.9E+Tky
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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_p=
rint_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_pr=
int_stack'; fs/btrfs/ctree.o:ctree.c:(.text.unlikely+0x0): first defined he=
re

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 <sfr@canb.auug.org.au>
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 <sfr@canb.auug.org.au>
---
 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)
 	}
 }
=20
-/*
- * We want the transaction abort to print stack trace only for errors wher=
e 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
--=20
2.35.1

--=20
Cheers,
Stephen Rothwell

--Sig_/oq=4tGTJq3rnBrFV.9E+Tky
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmNpidUACgkQAVBC80lX
0GwsMwf/Yo57BmamBzthT5n24b76a3FASjnevkQEfAq474KGTmyFl9S++8MModXl
Bv5bZe6O4UhH9GGqp8OXU59AMPoV14R/qh3Q/CE1zFnomAZbfQm3UMtYMLjWhv9n
6ed6cbKMwmOo0z8YLYOsdQf80t62g1+VrciN98MXyUvucgdB6WmnnbqQxv/q6ses
gHdN1mXVl9+gJWPq7/3PjWgcdjDCexMQaVm7GLOcFFY3Symxc6SJAAn1iMCG1hnt
RzKy81Svx0PFYITNo2kt1zxGQqy3ovoGkxSeMYWczyz8IoOv/SvtOzLfowLqQlu6
RjGf5osNKjN6LGMTS961hL9TRyuHKA==
=BpnA
-----END PGP SIGNATURE-----

--Sig_/oq=4tGTJq3rnBrFV.9E+Tky--