From: Jens Axboe Date: Fri, 12 Oct 2018 15:24:57 +0000 (-0600) Subject: block: remove bogus check for queue_lock assignment X-Git-Tag: v4.20-rc1~191^2~35 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5e27891e88555fecd8262e110e1a29feca4b0166;p=uclinux-h8%2Flinux.git block: remove bogus check for queue_lock assignment We just allocated the queue and haven't even set it up yet, hence we know that checking if ->mq_ops is NULL is always going to be true. In fact we do need to assign a lock to ->queue_lock always, as we need it for the queue flags modifications. Signed-off-by: Jens Axboe --- diff --git a/block/blk-core.c b/block/blk-core.c index c5539eed0202..cdfabc5646da 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1054,8 +1054,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id, mutex_init(&q->sysfs_lock); spin_lock_init(&q->__queue_lock); - if (!q->mq_ops) - q->queue_lock = lock ? : &q->__queue_lock; + q->queue_lock = lock ? : &q->__queue_lock; /* * A queue starts its life with bypass turned on to avoid