From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Matthew Wilcox <willy@infradead.org>,
David Howells <dhowells@redhat.com>
Cc: 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 folio tree
Date: Wed, 22 Sep 2021 14:19:10 +1000 [thread overview]
Message-ID: <20210922141910.778a5a86@canb.auug.org.au> (raw)
In-Reply-To: <20210921142628.75ba9ef2@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2795 bytes --]
Hi all,
On Tue, 21 Sep 2021 14:26:28 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the folio tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> fs/9p/vfs_file.c: In function 'v9fs_vm_page_mkwrite':
> fs/9p/vfs_file.c:557:6: error: implicit declaration of function 'wait_on_page_bit_killable'; did you mean 'wait_on_page_locked_killable'? [-Werror=implicit-function-declaration]
> 557 | wait_on_page_bit_killable(page, PG_writeback) < 0)
> | ^~~~~~~~~~~~~~~~~~~~~~~~~
> | wait_on_page_locked_killable
>
> Caused by commit
>
> be8f72914261 ("mm/filemap: Add folio_wait_bit()")
>
> interacting with commit
>
> 82766b47b26c ("9p: (untested) Convert to using the netfs helper lib to do reads and caching")
>
> from the fscache tree.
>
> I have applied the following merge fix patch.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 21 Sep 2021 14:18:06 +1000
> Subject: [PATCH] fix up for "9p: (untested) Convert to using the netfs helper
> lib to do reads and caching"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> fs/9p/vfs_file.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
> index 4b617d10cf28..68d05b2aa290 100644
> --- a/fs/9p/vfs_file.c
> +++ b/fs/9p/vfs_file.c
> @@ -554,7 +554,7 @@ v9fs_vm_page_mkwrite(struct vm_fault *vmf)
> #endif
>
> if (PageWriteback(page) &&
> - wait_on_page_bit_killable(page, PG_writeback) < 0)
> + folio_wait_bit_killable(page_folio(page), PG_writeback) < 0)
> return VM_FAULT_RETRY;
>
> /* Update file times before taking page lock */
This fix patch now looks like this:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 22 Sep 2021 14:16:55 +1000
Subject: [PATCH] fix up for "9p: Convert to using the netfs helper lib to do reads and caching"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
fs/9p/vfs_file.c | 4 ++--
1 file changed, 2 insertion(+), 2 deletion(-)
diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
index 7ed76a4c18f1..0f99ec49006e 100644
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@ -549,12 +549,12 @@ v9fs_vm_page_mkwrite(struct vm_fault *vmf)
*/
#ifdef CONFIG_9P_FSCACHE
if (PageFsCache(page) &&
- wait_on_page_bit_killable(page, PG_fscache) < 0)
+ folio_wait_bit_killable(page_folio(page), PG_fscache) < 0)
return VM_FAULT_RETRY;
#endif
if (PageWriteback(page) &&
- wait_on_page_bit_killable(page, PG_writeback) < 0)
+ folio_wait_bit_killable(page_folio(page), PG_writeback) < 0)
return VM_FAULT_RETRY;
/* Update file times before taking page lock */
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-09-22 4:19 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-21 4:26 linux-next: build failure after merge of the folio tree Stephen Rothwell
2021-09-22 4:19 ` Stephen Rothwell [this message]
2021-11-01 22:05 ` Stephen Rothwell
2021-11-02 7:02 ` David Howells
2021-11-01 6:48 Stephen Rothwell
2022-01-04 7:29 Stephen Rothwell
2022-02-07 4:06 Stephen Rothwell
2022-02-09 3:38 ` Stephen Rothwell
2022-02-09 3:47 ` Matthew Wilcox
2022-02-15 6:44 Stephen Rothwell
2022-02-17 7:20 Stephen Rothwell
2022-02-28 12:53 Stephen Rothwell
2022-03-15 10:26 Stephen Rothwell
2022-03-15 14:42 ` Matthew Wilcox
2022-05-02 8:04 Stephen Rothwell
2022-05-02 10:01 ` Gao Xiang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210922141910.778a5a86@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dhowells@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).