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

[Stephen Rothwell]

Hi all,

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.

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 23 Jul 2021 10:47:23 +1000
Subject: [PATCH] fxup for "f2fs: Convert to using invalidate_lock"

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 fs/f2fs/data.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 2e6fee68f891..0fb7b69976f1 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -3141,12 +3141,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]);
 	}
 }
-- 
2.30.2

-- 
Cheers,
Stephen Rothwell

Attachment: pgpZ5LW3KYNyD.pgp
Description: OpenPGP digital signature