From: Alan Stern <stern@rowland.harvard.edu>
Date: Tue, 9 Sep 2014 15:50:58 +0000 (-0400)
Subject: Block: fix unbalanced bypass-disable in blk_register_queue
X-Git-Tag: fixes-for-v3.18-merge-window~132^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df35c7c912fe668797681842b3b74c61b0664050;p=pandora-kernel.git

Block: fix unbalanced bypass-disable in blk_register_queue

When a queue is registered, the block layer turns off the bypass
setting (because bypass is enabled when the queue is created).  This
doesn't work well for queues that are unregistered and then registered
again; we get a WARNING because of the unbalanced calls to
blk_queue_bypass_end().

This patch fixes the problem by making blk_register_queue() call
blk_queue_bypass_end() only the first time the queue is registered.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Acked-by: Tejun Heo <tj@kernel.org>
CC: James Bottomley <James.Bottomley@HansenPartnership.com>
CC: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Jens Axboe <axboe@fb.com>
---

Reading git-diff-tree failed