iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

null_blk: use blk_mq_init_queue_data

Browse Source 
Use the new blk_mq_init_queue_data instead of open coding the queue
allocation and initialization.

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2020-03-27 09:30:09 +01:00 committed by Jens Axboe
parent 2f227bb999
commit 8d96a1117c
1 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/block/null_blk_main.c
View File

@ -1698,27 +1698,6 @@ static bool null_setup_fault(void)
return true;
}
/*
* This function is identical to blk_mq_init_queue() except that it sets
* queuedata before .init_hctx is called.
*/
static struct request_queue *nullb_alloc_queue(struct nullb *nullb)
{
struct request_queue *uninit_q, *q;
struct blk_mq_tag_set *set = nullb->tag_set;
uninit_q = blk_alloc_queue_node(GFP_KERNEL, set->numa_node);
if (!uninit_q)
return ERR_PTR(-ENOMEM);
uninit_q->queuedata = nullb;
q = blk_mq_init_allocated_queue(set, uninit_q, false);
if (IS_ERR(q))
blk_cleanup_queue(uninit_q);
return q;
}
static int null_add_dev(struct nullb_device *dev)
{
struct nullb *nullb;
@ -1758,7 +1737,7 @@ static int null_add_dev(struct nullb_device *dev)
goto out_cleanup_queues;
nullb->tag_set->timeout = 5 * HZ;
nullb->q = nullb_alloc_queue(nullb);
nullb->q = blk_mq_init_queue_data(nullb->tag_set, nullb);
if (IS_ERR(nullb->q)) {
rv = -ENOMEM;
goto out_cleanup_tags;