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 <[email protected]>
Date: Thu, 11 Jul 2019 15:13:21 +1000
Subject: [PATCH] f2fs: fix for wbc_account_io rename
Signed-off-by: Stephen Rothwell <[email protected]>
---
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
Hello,
Yeah, my patche series raced with 8648de2c581e ("f2fs: add bio cache
for IPU"). Jens, can you please apply this one too?
On Thu, Jul 11, 2019 at 03:15:07PM +1000, Stephen Rothwell wrote:
> From: Stephen Rothwell <[email protected]>
> Date: Thu, 11 Jul 2019 15:13:21 +1000
> Subject: [PATCH] f2fs: fix for wbc_account_io rename
>
> Signed-off-by: Stephen Rothwell <[email protected]>
> ---
> 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);
Acked-by: Tejun Heo <[email protected]>
Thanks.
--
tejun
On 7/11/19 2:17 PM, Tejun Heo wrote:
> Hello,
>
> Yeah, my patche series raced with 8648de2c581e ("f2fs: add bio cache
> for IPU"). Jens, can you please apply this one too?
I can't really, as that commit isn't in Linus's tree yet. I'll
keep an eye out for what hits mainline, I'll probably ship what
I have on Monday.
--
Jens Axboe
On 10/27/19 8:59 PM, Stephen Rothwell wrote:
> Hi all,
>
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> fs/io_uring.c: In function '__io_sqe_files_unregister':
> fs/io_uring.c:3010:12: error: invalid storage class for function 'io_sqe_files_unregister'
> 3010 | static int io_sqe_files_unregister(struct io_ring_ctx *ctx)
> | ^~~~~~~~~~~~~~~~~~~~~~~
> fs/io_uring.c:3010:1: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
> 3010 | static int io_sqe_files_unregister(struct io_ring_ctx *ctx)
> | ^~~~~~
>
> Caused by commit
>
> ed9e02e4bad1 ("io_uring: support for larger fixed file sets")
>
> I have used the block tree from next-20191025 for today.
Ah shoot, forgot to update for-next, I did fix this silly error
yesterday. If you're up for it, pull for-next again in 2 min and I'll
have it updated. If not, I guess it'll be there in the next one. Usually
doesn't matter, only asking because syzbot keeps flagging the same issue
that is also fixed.
--
Jens Axboe