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:   Mon, 25 May 2020 15:08:37 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>, David Sterba <dsterba@suse.cz>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Goldwyn Rodrigues <rgoldwyn@suse.com>,
        Johannes Thumshirn <jthumshirn@suse.de>,
        Christoph Hellwig <hch@lst.de>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20200525150837.54fe6977@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/7gBx1a6cPvmeoXQ7VXvq9OV";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/7gBx1a6cPvmeoXQ7VXvq9OV
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

After merging the block tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

mm/filemap.c: In function 'generic_file_buffered_read':
mm/filemap.c:2075:9: error: 'written' undeclared (first use in this functio=
n); did you mean 'writeb'?
 2075 |     if (written) {
      |         ^~~~~~~
      |         writeb

Caused by commit

  23d513106fd8 ("mm: support async buffered reads in generic_file_buffered_=
read()")

from the block tree interacting with commit

  6e66f10f2cac ("fs: export generic_file_buffered_read()")

from the btrfs tree.

[Aside: that btrfs tree commit talks about "correct the comments and variab=
le
    names", but changes "written" to "copied" in the function definition
    but to "already_read" in the header file declaration ...]

I ave applied the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 25 May 2020 15:00:44 +1000
Subject: [PATCH] mm: fix up for "fs: export generic_file_buffered_read()" m=
erge

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 mm/filemap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/filemap.c b/mm/filemap.c
index 742998883d9c..208095551a17 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2072,7 +2072,7 @@ ssize_t generic_file_buffered_read(struct kiocb *iocb,
 			 * serialisations and why it's safe.
 			 */
 			if (iocb->ki_flags & IOCB_WAITQ) {
-				if (written) {
+				if (copied) {
 					put_page(page);
 					goto out;
 				}
--=20
2.26.2

--=20
Cheers,
Stephen Rothwell

--Sig_/7gBx1a6cPvmeoXQ7VXvq9OV
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl7LUtUACgkQAVBC80lX
0GwWdAgAlG7GWe4av20SGsQef429kNxCI2e2YZDzj4Vh0OZOQpSSuD8vzFFUpO0H
RlyfnpMcIhHxhd0hrU7995vEfUz13+nty5oViOGbd4eX7L3nJr9Btf1EEAMKZ/FG
b3VnvC4JA5ZwgVfB17lCcDhDHrKhO52QKdrUcxBLIg3OXV3mUjslM32H9/JQnPx/
PZKz/UAOvqmDAjYo1PdoL4FKdwRerKV3KORDCZCSIXjhBJ3tvsFWDfZfVnNkIGwp
jftYrog/AHSRtfQBr+F3+BXlWKYjX2nDqOXhdAHeYP37h3n7cuowrpCClF99S42z
2Wr6jp7R719uLkGSKEisZpoOrAWhBQ==
=+/BU
-----END PGP SIGNATURE-----

--Sig_/7gBx1a6cPvmeoXQ7VXvq9OV--