Hi all,
On Thu, 21 Dec 2023 11:18:47 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> After merging the vfs-brauner tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> 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=implicit-function-declaration]
> 569 | generic_error_remove_page(mapping, folio_page(folio, 0));
> | ^~~~~~~~~~~~~~~~~~~~~~~~~
> | generic_error_remove_folio
>
> Caused by commit
>
> dec5b4af52dc ("netfs: Provide a writepages implementation")
>
> interacting with commit
>
> af7628d6ec19 ("fs: convert error_remove_page to error_remove_folio")
>
> from the mm-stable tree.
>
> I have applied the following merge resolution patch:
The resolution is now:
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxx>
---
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 *mapping,
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);
--
2.43.0
--
Cheers,
Stephen Rothwell
Attachment:
pgpFYm93uL5cW.pgp
Description: OpenPGP digital signature
