Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 60ea8226cbd5c8301f9a39edc574ddabcb8150e0

Authored by Tejun Heo
Committed by Jens Axboe
1 parent 749fefe677
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

... ... @@ -696,7 +696,7 @@
696 696 q->request_fn = rfn;
697 697 q->prep_rq_fn = NULL;
698 698 q->unprep_rq_fn = NULL;
699   - q->queue_flags = QUEUE_FLAG_DEFAULT;
  699 + q->queue_flags |= QUEUE_FLAG_DEFAULT;
700 700  
701 701 /* Override internal queue lock with supplied lock pointer */
702 702 if (lock)