mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 20:22:09 +00:00
block: fix request_queue->flags initialization
A queue newly allocated with blk_alloc_queue_node() has only QUEUE_FLAG_BYPASS set. For request-based drivers, blk_init_allocated_queue() is called and q->queue_flags is overwritten with QUEUE_FLAG_DEFAULT which doesn't include BYPASS even though the initial bypass is still in effect. In blk_init_allocated_queue(), or QUEUE_FLAG_DEFAULT to q->queue_flags instead of overwriting. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: stable@vger.kernel.org Acked-by: Vivek Goyal <vgoyal@redhat.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
parent
749fefe677
commit
60ea8226cb
@ -696,7 +696,7 @@ blk_init_allocated_queue(struct request_queue *q, request_fn_proc *rfn,
|
|||||||
q->request_fn = rfn;
|
q->request_fn = rfn;
|
||||||
q->prep_rq_fn = NULL;
|
q->prep_rq_fn = NULL;
|
||||||
q->unprep_rq_fn = NULL;
|
q->unprep_rq_fn = NULL;
|
||||||
q->queue_flags = QUEUE_FLAG_DEFAULT;
|
q->queue_flags |= QUEUE_FLAG_DEFAULT;
|
||||||
|
|
||||||
/* Override internal queue lock with supplied lock pointer */
|
/* Override internal queue lock with supplied lock pointer */
|
||||||
if (lock)
|
if (lock)
|
||||||
|
Loading…
Reference in New Issue
Block a user