Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Fri, 23 Jul 2021 11:11:19 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jaegeuk Kim <jaegeuk@kernel.org>, Jan Kara <jack@suse.cz>
Cc:     Eric Biggers <ebiggers@google.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the f2fs tree
Message-ID: <20210723111119.6b2bf2ca@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/OYT2+qHFpHm+gCfkzpPIRJM";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/OYT2+qHFpHm+gCfkzpPIRJM
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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 func=
tion)
 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@canb.auug.org.au>
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@canb.auug.org.au>
---
 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);
=20
 		truncate_pagecache(inode, i_size);
 		f2fs_truncate_blocks(inode, i_size, true);
=20
-		filemap_invalidate_unlock(mapping);
+		filemap_invalidate_unlock(inode->i_mapping);
 		up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
 	}
 }
--=20
2.30.2

--=20
Cheers,
Stephen Rothwell

--Sig_/OYT2+qHFpHm+gCfkzpPIRJM
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmD6FzcACgkQAVBC80lX
0Gw+gwf/ef0gpKx8v/8G/Ix31qXzNZi20cXsNi0j+LQP19SRucfdO5LT3A9xi3hQ
inI0R3xaZseKpmA9DSOZedksMWrTGjq6e4LtOr4b3i7UEKeTNWvBmHzqJk7DQHZ6
FFgJjUhHq+N7TXiYNbxRC5gaM4/bauiKI6Wrx86lf6i69xXCe4XYqHTcSweUzSx5
skfzSFXvrYVPKz7yh2qJUdnosC0+xqByPymqNNJqDGRqwWLsuh3EBxziwPgPf0KG
tl5v1UYigmf4j3XerFHPvexBwMjI3xzkxpQa37LeKb5uJkLh5NEV6kZGpFwQQyog
6Eh6QmwgQ+yK/Ytxf9Cf9dyXkDF5vQ==
=4AJA
-----END PGP SIGNATURE-----

--Sig_/OYT2+qHFpHm+gCfkzpPIRJM--