lkml.org 
[lkml]   [2021]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 001/169] block/mq-deadline: Move dd_queued() to fix defined but not used warning
    Date
    From: Geert Uytterhoeven <geert@linux-m68k.org>

    commit 55a51ea14094a1e7dd0d7f33237d246033dd39ab upstream.

    If CONFIG_BLK_DEBUG_FS=n:

    block/mq-deadline.c:274:12: warning: ‘dd_queued’ defined but not used [-Wunused-function]
    274 | static u32 dd_queued(struct deadline_data *dd, enum dd_prio prio)
    | ^~~~~~~~~

    Fix this by moving dd_queued() just before the sole function that calls
    it.

    Fixes: 7b05bf771084ff78 ("Revert "block/mq-deadline: Prioritize high-priority requests"")
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Fixes: 38ba64d12d4c ("block/mq-deadline: Track I/O statistics")
    Reviewed-by: Bart Van Assche <bvanassche@acm.org>
    Link: https://lore.kernel.org/r/20210830091128.1854266-1-geert@linux-m68k.org
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    block/mq-deadline.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    --- a/block/mq-deadline.c
    +++ b/block/mq-deadline.c
    @@ -270,12 +270,6 @@ deadline_move_request(struct deadline_da
    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 *dat
    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;

    \
     
     \ /
      Last update: 2021-10-25 21:46    [W:4.145 / U:0.224 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site