[v1] linux-next: build failure after merge of the vfs-brauner tree

linux-next: build failure after merge of the vfs-brauner tree

Stephen Rothwell posted 1 patch 1 year, 4 months ago

Diff against v1 v1 v1 v1 v1 v1 v1 v1
Download mbox

There is a newer version of this series

fs/f2fs/data.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Expand all Fold all

linux-next: build failure after merge of the vfs-brauner tree

Posted by Stephen Rothwell 1 year, 4 months ago

Hi all,

After merging the vfs-brauner tree, today's linux-next build (x86_64
allmodconfig) failed like this:

fs/f2fs/data.c: In function 'f2fs_write_end':
fs/f2fs/data.c:3735:41: error: 'page' undeclared (first use in this function)
 3735 |                 set_page_private_atomic(page);
      |                                         ^~~~

Caused by commit

  300dd0fa8e20 ("fs: Convert aops->write_end to take a folio")

interacting with commit

  1a0bd289a5db ("f2fs: atomic: fix to avoid racing w/ GC")

from the f2fs tree.

I have applied the following merge fix patch for today.  This makes it
build, but there is probably a better resolution.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 6 Aug 2024 10:35:46 +1000
Subject: [PATCH] fixup for "fs: Convert aops->write_end to take a folio"

interacting with "f2fs: atomic: fix to avoid racing w/ GC" from the
f2fs tree.
---
 fs/f2fs/data.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index bfc81203bd0a..908a836dd1c3 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -3732,7 +3732,7 @@ static int f2fs_write_end(struct file *file,
 	folio_mark_dirty(folio);
 
 	if (f2fs_is_atomic_file(inode))
-		set_page_private_atomic(page);
+		set_page_private_atomic(&folio->page);
 
 	if (pos + copied > i_size_read(inode) &&
 	    !f2fs_verity_in_progress(inode)) {
-- 
2.43.0

-- 
Cheers,
Stephen Rothwell