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

[Stephen Rothwell]

Hi all,

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

fs/libfs.c: In function 'generic_file_fsync':
fs/libfs.c:1116:9: error: too few arguments to function 'blkdev_issue_flush'
 1116 |  return blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL);
      |         ^~~~~~~~~~~~~~~~~~
In file included from fs/libfs.c:7:
include/linux/blkdev.h:1875:19: note: declared here
 1875 | static inline int blkdev_issue_flush(struct block_device *bdev, gfp_t gfp_mask,
      |                   ^~~~~~~~~~~~~~~~~~

Caused by commit

  c64644ce363b ("block: remove the error_sector argument to blkdev_issue_flush")

I have applied the following patch.

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 22 May 2020 21:21:54 +1000
Subject: [PATCH] block: fix for "remove the error_sector argument to
 blkdev_issue_flush"

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 include/linux/blkdev.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 95f1e6db31e2..7d10f4e63232 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1872,8 +1872,7 @@ static inline bool blk_needs_flush_plug(struct task_struct *tsk)
 	return false;
 }
 
-static inline int blkdev_issue_flush(struct block_device *bdev, gfp_t gfp_mask,
-				     sector_t *error_sector)
+static inline int blkdev_issue_flush(struct block_device *bdev, gfp_t gfp_mask)
 {
 	return 0;
 }
-- 
2.26.2

-- 
Cheers,
Stephen Rothwell

Attachment: pgpconSFiFrta.pgp
Description: OpenPGP digital signature