Home Home > GIT Browse > SLE15-SP1
diff options
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-22 08:33:26 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-22 08:33:26 -0700
commit798e16a6e67328ba4a9fa8b2df99b4754f133613 (patch)
parente496537363b337a318a2f113029e68b76f9baa2d (diff)
Revert "block: fix request_queue->flags initialization"
This reverts commit 2101aa5bb084931f22fa08cacd6d69c80afade7f which is commit 60ea8226cbd5c8301f9a39edc574ddabcb8150e0 upstream. To quote Ben: This is not needed, as there is no QUEUE_FLAG_BYPASS in 3.0.y. To quote Tejun: I don't think it will break anything as it simply changes assignment to |= to avoid overwriting existing flags. That said, any patch can break anything, so if possible it would be better to drop for 3.0.y. So I'll revert this to be safe. Cc: Tejun Heo <tj@kernel.org> Cc: Vivek Goyal <vgoyal@redhat.com> Cc: Jens Axboe <axboe@kernel.dk> Cc: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index 2f49f43c4565..35ae52df6b6d 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -524,7 +524,7 @@ blk_init_allocated_queue(struct request_queue *q, request_fn_proc *rfn,
q->request_fn = rfn;
q->prep_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 */
if (lock)