Messages in this thread Patch in this message | | | Date | Thu, 11 Jul 2019 15:04:09 +1000 | From | Stephen Rothwell <> | Subject | linux-next: build failure after merge of the block tree |
| |
Hi all,
After merging the block tree, today's linux-next build (powerpc ppc64_defconfig) failed like this:
fs/xfs/xfs_aops.c: In function 'xfs_add_to_ioend': fs/xfs/xfs_aops.c:799:2: error: implicit declaration of function 'wbc_account_io'; did you mean 'blk_account_rq'? [-Werror=implicit-function-declaration] wbc_account_io(wbc, page, len); ^~~~~~~~~~~~~~ blk_account_rq
Caused by commit
34e51a5e1a6e ("blkcg, writeback: Rename wbc_account_io() to wbc_account_cgroup_owner()")
interacting with commit
adfb5fb46af0 ("xfs: implement cgroup aware writeback")
from the xfs tree.
I have applied the following merge fix patch:
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Thu, 11 Jul 2019 15:01:54 +1000 Subject: [PATCH] xfs: fix up for wbc_account_io rename
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- fs/xfs/xfs_aops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c index 761248ee2778..f16d5f196c6b 100644 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c @@ -796,7 +796,7 @@ xfs_add_to_ioend( } wpc->ioend->io_size += len; - wbc_account_io(wbc, page, len); + wbc_account_cgroup_owner(wbc, page, len); } STATIC void -- 2.20.1 -- Cheers, Stephen Rothwell [unhandled content-type:application/pgp-signature] | |