Block: fix unbalanced bypass-disable in blk_register_queue
authorAlan Stern <stern@rowland.harvard.edu>
Tue, 9 Sep 2014 15:50:58 +0000 (11:50 -0400)
committerJens Axboe <axboe@fb.com>
Tue, 9 Sep 2014 16:44:24 +0000 (10:44 -0600)
commitdf35c7c912fe668797681842b3b74c61b0664050
tree1026ae593bef21aabb5d169e170086797d2e1520
parent2da78092dda13f1efd26edbbf99a567776913750
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>
block/blk-sysfs.c