From 754a15726f8d82afa87076505ce00a6a5806a48f Mon Sep 17 00:00:00 2001 From: Guoqing Jiang Date: Mon, 9 Mar 2020 22:41:37 +0100 Subject: [PATCH] block: remove unneeded argument from blk_alloc_flush_queue Remove 'q' from arguments since it is not used anymore after commit 7e992f847a08e ("block: remove non mq parts from the flush code"). Signed-off-by: Guoqing Jiang Reviewed-by: Nikolay Borisov Reviewed-by: Bart Van Assche Reviewed-by: Chaitanya Kulkarni Signed-off-by: Jens Axboe --- block/blk-flush.c | 4 ++-- block/blk-mq.c | 3 +-- block/blk.h | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/block/blk-flush.c b/block/blk-flush.c index 5cc775bdb06a..7f7f98305115 100644 --- a/block/blk-flush.c +++ b/block/blk-flush.c @@ -485,8 +485,8 @@ int blkdev_issue_flush(struct block_device *bdev, gfp_t gfp_mask, } EXPORT_SYMBOL(blkdev_issue_flush); -struct blk_flush_queue *blk_alloc_flush_queue(struct request_queue *q, - int node, int cmd_size, gfp_t flags) +struct blk_flush_queue *blk_alloc_flush_queue(int node, int cmd_size, + gfp_t flags) { struct blk_flush_queue *fq; int rq_sz = sizeof(struct request); diff --git a/block/blk-mq.c b/block/blk-mq.c index 37ff8dfb8ab9..5b2e6550e0b6 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -2409,8 +2409,7 @@ blk_mq_alloc_hctx(struct request_queue *q, struct blk_mq_tag_set *set, init_waitqueue_func_entry(&hctx->dispatch_wait, blk_mq_dispatch_wake); INIT_LIST_HEAD(&hctx->dispatch_wait.entry); - hctx->fq = blk_alloc_flush_queue(q, hctx->numa_node, set->cmd_size, - gfp); + hctx->fq = blk_alloc_flush_queue(hctx->numa_node, set->cmd_size, gfp); if (!hctx->fq) goto free_bitmap; diff --git a/block/blk.h b/block/blk.h index 0b8884353f6b..670337b7cfa0 100644 --- a/block/blk.h +++ b/block/blk.h @@ -55,8 +55,8 @@ is_flush_rq(struct request *req, struct blk_mq_hw_ctx *hctx) return hctx->fq->flush_rq == req; } -struct blk_flush_queue *blk_alloc_flush_queue(struct request_queue *q, - int node, int cmd_size, gfp_t flags); +struct blk_flush_queue *blk_alloc_flush_queue(int node, int cmd_size, + gfp_t flags); void blk_free_flush_queue(struct blk_flush_queue *q); void blk_freeze_queue(struct request_queue *q); -- GitLab