2021-02-23 03:04:39

by Stephen Rothwell

[permalink] [raw]
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/io_uring.c: In function 'io_sq_thread':
fs/io_uring.c:6787:3: error: implicit declaration of function 'io_ctx_disable_sqo_submit' [-Werror=implicit-function-declaration]
6787 | io_ctx_disable_sqo_submit(ctx);
| ^~~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

a6afa091d06a ("io_uring: move SQPOLL thread io-wq forked worker")

I have used the block tree from next-20210222 for today.

--
Cheers,
Stephen Rothwell


Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2021-08-10 14:18:19

by Christoph Hellwig

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the block tree

The patch below fixes it.

---
From 28be8f9a9da95d54b7fce80332bf2c62abfcdf73 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <[email protected]>
Date: Tue, 10 Aug 2021 14:39:24 +0200
Subject: writeback: make the laptop_mode prototypes available unconditionally

Fix the !CONFIG_BLOCK build after the recent cleanup.

Fixes: 5ed964f8e54e ("mm: hide laptop_mode_wb_timer entirely behind the BDI API")
Reported-by: Stephen Rothwell <[email protected]>
Signed-off-by: Christoph Hellwig <[email protected]>
---
include/linux/writeback.h | 5 -----
1 file changed, 5 deletions(-)

diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index 667e86cfbdcf..270677dc4f36 100644
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -336,14 +336,9 @@ static inline void cgroup_writeback_umount(void)
/*
* mm/page-writeback.c
*/
-#ifdef CONFIG_BLOCK
void laptop_io_completion(struct backing_dev_info *info);
void laptop_sync_completion(void);
-void laptop_mode_sync(struct work_struct *work);
void laptop_mode_timer_fn(struct timer_list *t);
-#else
-static inline void laptop_sync_completion(void) { }
-#endif
bool node_dirty_ok(struct pglist_data *pgdat);
int wb_domain_init(struct wb_domain *dom, gfp_t gfp);
#ifdef CONFIG_CGROUP_WRITEBACK
--
2.30.2

2021-08-10 14:18:39

by Jens Axboe

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the block tree

On 8/10/21 6:58 AM, Christoph Hellwig wrote:
> The patch below fixes it.
>

Added, thanks.

--
Jens Axboe

2021-08-10 14:22:42

by Stephen Rothwell

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the block tree

Hi Christoph,

On Tue, 10 Aug 2021 14:58:13 +0200 Christoph Hellwig <[email protected]> wrote:
>
> The patch below fixes it.

Thanks for the fast response.

--
Cheers,
Stephen Rothwell


Attachments:
(No filename) (499.00 B)
OpenPGP digital signature