[PATCH] mq-deadline: Fix build error for !BLK_DEBUG_FS

[PATCH] mq-deadline: Fix build error for !BLK_DEBUG_FS

[Huacai Chen]

Function dd_queued() is only used in dd_queued_show(), but dd_queued_
show() is only defined for BLK_DEBUG_FS enabled. However, in the commit
3fe617ccafd6f5bb3 ("Enable '-Werror' by default for all kernel builds")
Werror is enabled by default, which cause a build error if DEBUG_FS is
not enabled.

So we move dd_queued() in the CONFIG_BLK_DEBUG_FS block to fix it.

Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
---
 block/mq-deadline.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/block/mq-deadline.c b/block/mq-deadline.c
index 3c3693c34f06..7f3c3932b723 100644
--- a/block/mq-deadline.c
+++ b/block/mq-deadline.c
@@ -270,12 +270,6 @@ deadline_move_request(struct deadline_data *dd, struct dd_per_prio *per_prio,
 	deadline_remove_request(rq->q, per_prio, rq);
 }
 
-/* Number of requests queued for a given priority level. */
-static u32 dd_queued(struct deadline_data *dd, enum dd_prio prio)
-{
-	return dd_sum(dd, inserted, prio) - dd_sum(dd, completed, prio);
-}
-
 /*
  * deadline_check_fifo returns 0 if there are no expired requests on the fifo,
  * 1 otherwise. Requires !list_empty(&dd->fifo_list[data_dir])
@@ -953,6 +947,12 @@ static int dd_async_depth_show(void *data, struct seq_file *m)
 	return 0;
 }
 
+/* Number of requests queued for a given priority level. */
+static u32 dd_queued(struct deadline_data *dd, enum dd_prio prio)
+{
+	return dd_sum(dd, inserted, prio) - dd_sum(dd, completed, prio);
+}
+
 static int dd_queued_show(void *data, struct seq_file *m)
 {
 	struct request_queue *q = data;
-- 
2.27.0

Re: [PATCH] mq-deadline: Fix build error for !BLK_DEBUG_FS

[Jens Axboe]

On 9/5/21 9:09 PM, Huacai Chen wrote:
> Function dd_queued() is only used in dd_queued_show(), but dd_queued_
> show() is only defined for BLK_DEBUG_FS enabled. However, in the commit
> 3fe617ccafd6f5bb3 ("Enable '-Werror' by default for all kernel builds")
> Werror is enabled by default, which cause a build error if DEBUG_FS is
> not enabled.
> 
> So we move dd_queued() in the CONFIG_BLK_DEBUG_FS block to fix it.

This has already been queued up for a while:

https://git.kernel.dk/cgit/linux-block/commit/?h=block-5.15&id=55a51ea14094a1e7dd0d7f33237d246033dd39ab

-- 
Jens Axboe