Subject: Re: linux-next: build failure after merge of the f2fs tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 27 Aug 2021 10:28:40 +1000

Hi all,

On Fri, 23 Jul 2021 11:11:19 +1000 Stephen Rothwell <[email-masked]> wrote:
>
> After merging the f2fs tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> fs/f2fs/data.c: In function 'f2fs_write_failed':
> fs/f2fs/data.c:3144:27: error: 'mapping' undeclared (first use in this function)
>  3144 |   filemap_invalidate_lock(mapping);
>       |                           ^~~~~~~
> 
> Caused by commit
> 
>   ceddc02b7613 ("f2fs: make f2fs_write_failed() take struct inode")
> 
> interacting with commit
> 
>   edc6d01bad73 ("f2fs: Convert to using invalidate_lock")
> 
> from the ext3 tree.
> 
> I have applied the following merge fix patch.
> 

This fix up patch is now:

From: Stephen Rothwell <[email-masked]>
Date: Fri, 27 Aug 2021 10:10:01 +1000
Subject: [PATCH] fxup for "f2fs: Convert to using invalidate_lock"

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 fs/f2fs/data.c | 4 ++--
 fs/f2fs/file.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index b03ec36cce1c..0facb5eb0acb 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -3260,12 +3260,12 @@ static void f2fs_write_failed(struct inode *inode, loff_t to)
 	/* In the fs-verity case, f2fs_end_enable_verity() does the truncate */
 	if (to > i_size && !f2fs_verity_in_progress(inode)) {
 		down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
-		filemap_invalidate_lock(mapping);
+		filemap_invalidate_lock(inode->i_mapping);
 
 		truncate_pagecache(inode, i_size);
 		f2fs_truncate_blocks(inode, i_size, true);
 
-		filemap_invalidate_unlock(mapping);
+		filemap_invalidate_unlock(inode->i_mapping);
 		up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
 	}
 }
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 884a165e70eb..9c8ef33bd8d3 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -1112,7 +1112,7 @@ static int punch_hole(struct inode *inode, loff_t offset, loff_t len)
 			blk_end = (loff_t)pg_end << PAGE_SHIFT;
 
 			down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
-			filemap_invalidate_lock(mapping);
+			filemap_invalidate_lock(inode->i_mapping);
 
 			truncate_pagecache_range(inode, blk_start, blk_end - 1);
 
@@ -1120,7 +1120,7 @@ static int punch_hole(struct inode *inode, loff_t offset, loff_t len)
 			ret = f2fs_truncate_hole(inode, pg_start, pg_end);
 			f2fs_unlock_op(sbi);
 
-			filemap_invalidate_unlock(mapping);
+			filemap_invalidate_unlock(inode->i_mapping);
 			up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
 		}
 	}
-- 
2.32.0

-- 
Cheers,
Stephen Rothwell