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

[Stephen Rothwell]

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 function); 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 variable
    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@xxxxxxxxxxxxxxxx>
Date: Mon, 25 May 2020 15:00:44 +1000
Subject: [PATCH] mm: fix up for "fs: export generic_file_buffered_read()" merge

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 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;
 				}
-- 
2.26.2

-- 
Cheers,
Stephen Rothwell

Attachment: pgpuZ812sQsjg.pgp
Description: OpenPGP digital signature