Received-SPF: pass (google.com: domain of linux-kernel+bounces-9185-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Fri, 22 Dec 2023 10:41:28 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christian Brauner <brauner@kernel.org>, Andrew Morton
 <akpm@linux-foundation.org>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>, David Howells
 <dhowells@redhat.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the vfs-brauner tree
Message-ID: <20231222104128.395c9f7b@canb.auug.org.au>
In-Reply-To: <20231221111847.689ea41f@canb.auug.org.au>
References: <20231221111847.689ea41f@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/.cm1.unLtjyuD5TDODiIrCG";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/.cm1.unLtjyuD5TDODiIrCG
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Thu, 21 Dec 2023 11:18:47 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> After merging the vfs-brauner tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>=20
> fs/netfs/buffered_write.c: In function 'netfs_kill_pages':
> fs/netfs/buffered_write.c:569:17: error: implicit declaration of function=
 'generic_error_remove_page'; did you mean 'generic_error_remove_folio'? [-=
Werror=3Dimplicit-function-declaration]
>   569 |                 generic_error_remove_page(mapping, folio_page(fol=
io, 0));
>       |                 ^~~~~~~~~~~~~~~~~~~~~~~~~
>       |                 generic_error_remove_folio
>=20
> Caused by commit
>=20
>   dec5b4af52dc ("netfs: Provide a writepages implementation")
>=20
> interacting with commit
>=20
>   af7628d6ec19 ("fs: convert error_remove_page to error_remove_folio")
>=20
> from the mm-stable tree.
>=20
> I have applied the following merge resolution patch:

The resolution is now:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 21 Dec 2023 11:08:57 +1100
Subject: [PATCH] fixup for "netfs: Provide a writepages implementation"

interacting with

  af7628d6ec19 ("fs: convert error_remove_page to error_remove_folio")

from the mm-stable tree.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/netfs/buffered_write.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/netfs/buffered_write.c b/fs/netfs/buffered_write.c
index a739805dd394..d7ce424b9188 100644
--- a/fs/netfs/buffered_write.c
+++ b/fs/netfs/buffered_write.c
@@ -566,7 +566,7 @@ static void netfs_kill_pages(struct address_space *mapp=
ing,
 			folio_end_fscache(folio);
 		folio_end_writeback(folio);
 		folio_lock(folio);
-		generic_error_remove_page(mapping, &folio->page);
+		generic_error_remove_folio(mapping, folio);
 		folio_unlock(folio);
 		folio_put(folio);
=20
--=20
2.43.0

--=20
Cheers,
Stephen Rothwell

--Sig_/.cm1.unLtjyuD5TDODiIrCG
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWEzSgACgkQAVBC80lX
0Gy67Qf/dBCQz53014sVyhGXcSUBCZ6wcBh0sJ5qVPDzKbel88D531CbblYRGh5r
B+mPM1JkjciKQPuxszrmdIaaILv1b0vdgCgor1htROIX3GP9+x9G1Zj8jUQDg3B0
Ot7cCLupwrkv7pVdNPJxZcCvBhx5DvvHTJQCJ21xJbc17NSvOvj/Sy5DpFN/ILHc
H2KmLX2EjabRf8I1QiGMa5K/JCi9s23CfkqxdCrR8tYWRq5hB9qFzKtrPjKHdBWT
5cDMslFP/ptvZ4eabzEy+Rt4i7Db6KM2rUtWk60wgVd6nM+xXPhLqMjngk01aVGl
gC3LxwzZhQ/UxWYwA95eUmYc55iCGg==
=q7oI
-----END PGP SIGNATURE-----

--Sig_/.cm1.unLtjyuD5TDODiIrCG--