Hi Andrew, After merging the akpm-current tree, today's linux-next build (x86_64 allmodconfig) failed like this: fs/ocfs2/aops.c: In function 'ocfs2_direct_IO_write': fs/ocfs2/aops.c:784:9: error: too few arguments to function 'blkdev_issue_zeroout' ret = blkdev_issue_zeroout(osb->sb->s_bdev, ^ In file included from fs/ocfs2/aops.c:31:0: include/linux/blkdev.h:1165:12: note: declared here extern int blkdev_issue_zeroout(struct block_device *bdev, sector_t sector, ^ Caused by commit e95f8b5356c4 ("ocfs2: implement ocfs2_direct_IO_write") interacting with commit d93ba7a5a97c ("block: Add discard flag to blkdev_issue_zeroout() function") from the block tree. I have added this merge fix patch: From: Stephen Rothwell Date: Thu, 22 Jan 2015 18:28:21 +1100 Subject: [PATCH] ocfs2: implement ocfs2_direct_IO_write fix update for an API change Signed-off-by: Stephen Rothwell --- fs/ocfs2/aops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index 89f43dc7e440..af22615afd35 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c @@ -784,7 +784,7 @@ static ssize_t ocfs2_direct_IO_write(struct kiocb *iocb, ret = blkdev_issue_zeroout(osb->sb->s_bdev, p_cpos << (osb->s_clustersize_bits - 9), zero_len >> 9, - GFP_KERNEL); + GFP_KERNEL, false); if (ret < 0) mlog_errno(ret); } -- 2.1.4 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au