aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorVivek Goyal <vgoyal@redhat.com>2011-03-02 19:04:50 -0500
committerJens Axboe <jaxboe@fusionio.com>2011-03-02 19:06:49 -0500
commitcd25f54961273c2e4cbd47441e04832468382a5e (patch)
tree1c0e0442ce87000c2f24d13892aea3371b056153 /drivers/block
parentc94a96ac93b4f5b8d1ff8430b1afa1a25610cf53 (diff)
loop: No need to initialize ->queue_lock explicitly before calling blk_cleanup_queue()
Now we initialize ->queue_lock at queue allocation time so driver does not have to worry about initializing it before calling blk_cleanup_queue(). Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/loop.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 49e6a545eb63..44e18c073c44 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -1641,9 +1641,6 @@ out:
1641 1641
1642static void loop_free(struct loop_device *lo) 1642static void loop_free(struct loop_device *lo)
1643{ 1643{
1644 if (!lo->lo_queue->queue_lock)
1645 lo->lo_queue->queue_lock = &lo->lo_queue->__queue_lock;
1646
1647 blk_cleanup_queue(lo->lo_queue); 1644 blk_cleanup_queue(lo->lo_queue);
1648 put_disk(lo->lo_disk); 1645 put_disk(lo->lo_disk);
1649 list_del(&lo->lo_list); 1646 list_del(&lo->lo_list);