linux-next: build failure after merge of the folio tree
Subsystems (2)
Hi all,
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_killableCaused 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 <[email protected]>
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"
--- fs/9p/vfs_file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/9p/vfs_file.c +1 -1
@@ -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 */
Signature · 5 lines
2.32.0 -- Cheers, Stephen Rothwell
Hi all,
Quoted 37 lines · On Tue, 21 Sep 2021 14:26:28 +1000 Stephen Rothwell <[email protected]>…
After merging the folio tree, today's linux-next build (
x86_64allmodconfig) 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_killableCaused by commit
be8f72914261("mm/filemap: Addfolio_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 <[email protected]>
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 <[email protected]>--- fs/9p/vfs_file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/9p/vfs_file.c +0
-0
fs/9p/vfs_file.c v9fs_vm_page_mkwrite(struct vm_fault *vmf) · line 560
Quoted 8 lines
fs/9p/vfs_file.c +1
-1@@ -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 <[email protected]>
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"
--- fs/9p/vfs_file.c | 4 ++-- 1 file changed, 2 insertion(+), 2 deletion(-)
fs/9p/vfs_file.c +2 -2
@@ -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 */
Signature · 2 lines
Cheers, Stephen Rothwell
Hi all,
Quoted 68 lines · On Wed, 22 Sep 2021 14:19:10 +1000 Stephen Rothwell <[email protected]>…
Quoted 37 lines · On Tue, 21 Sep 2021 14:26:28 +1000 Stephen Rothwell <[email protected]>…
After merging the folio tree, today's linux-next build (
x86_64allmodconfig) 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_killableCaused by commit
be8f72914261("mm/filemap: Addfolio_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 <[email protected]>
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 <[email protected]>--- fs/9p/vfs_file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/9p/vfs_file.c +0
-0fs/9p/vfs_file.c v9fs_vm_page_mkwrite(struct vm_fault *vmf) · line 560
Quoted 8 lines
fs/9p/vfs_file.c +1
-1@@ -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 <[email protected]>
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 <[email protected]>--- fs/9p/vfs_file.c | 4 ++-- 1 file changed, 2 insertion(+), 2 deletion(-)fs/9p/vfs_file.c +0
-1@@ -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 )
fs/9p/vfs_file.c v9fs_vm_page_mkwrite(struct vm_fault *vmf) · line 560
Quoted 10 lines
fs/9p/vfs_file.c +2
-1+ 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 */
This is now a conflict between Linus' tree and the fscache tree.
Signature · 2 lines
Cheers, Stephen Rothwell
Quoted 5 lines · Stephen Rothwell
Quoted 2 lines
fs/9p/vfs_file.c +1
-1- wait_on_page_bit_killable(page, PG_fscache) < 0) + folio_wait_bit_killable(page_folio(page), PG_fscache) < 0)...
fs/9p/vfs_file.c v9fs_vm_page_mkwrite(struct vm_fault *vmf) · line 557
Quoted 2 lines
fs/9p/vfs_file.c +1
-1- wait_on_page_bit_killable(page, PG_writeback) < 0) + folio_wait_bit_killable(page_folio(page), PG_writeback) < 0)
I rebased it and pushed a new version, but I think I missed your pull by a couple of hours.
David