Hi all, After merging the block tree, today's linux-next build (x86_64 allmodconfig) failed like this: fs/f2fs/data.c: In function 'f2fs_merge_page_bio': fs/f2fs/data.c:516:3: error: implicit declaration of function 'wbc_account_io'; did you mean 'blk_account_rq'? [-Werror=implicit-function-declaration] wbc_account_io(fio->io_wbc, page, PAGE_SIZE); ^~~~~~~~~~~~~~ blk_account_rq Caused by commit 34e51a5e1a6e ("blkcg, writeback: Rename wbc_account_io() to wbc_account_cgroup_owner()") interacting with commit 8648de2c581e ("f2fs: add bio cache for IPU") from the f2fs tree. I added the following merge fix patch or today: From: Stephen Rothwell Date: Thu, 11 Jul 2019 15:13:21 +1000 Subject: [PATCH] f2fs: fix for wbc_account_io rename Signed-off-by: Stephen Rothwell --- fs/f2fs/data.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 323306630f93..4eb2f3920140 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -513,7 +513,7 @@ int f2fs_merge_page_bio(struct f2fs_io_info *fio) } if (fio->io_wbc) - wbc_account_io(fio->io_wbc, page, PAGE_SIZE); + wbc_account_cgroup_owner(fio->io_wbc, page, PAGE_SIZE); inc_page_count(fio->sbi, WB_DATA_TYPE(page)); -- 2.20.1 -- Cheers, Stephen Rothwell