[PATCH] regularize blk_cleanup_queue() use

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

2 files changed, 6 insertions, 3 deletions

diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 745ca1f67b14..88d60202b9db 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -840,7 +840,7 @@ static struct mapped_device *alloc_dev(unsigned int minor, int persistent)
  bad3:
         mempool_destroy(md->io_pool);
  bad2:
-        blk_put_queue(md->queue);
+        blk_cleanup_queue(md->queue);
         free_minor(minor);
  bad1:
         kfree(md);
@@ -860,7 +860,7 @@ static void free_dev(struct mapped_device *md)
         del_gendisk(md->disk);
         free_minor(minor);
         put_disk(md->disk);
-        blk_put_queue(md->queue);
+        blk_cleanup_queue(md->queue);
         kfree(md);
 }
 
diff --git a/drivers/md/md.c b/drivers/md/md.c
index d05e3125d298..5ed2228745cb 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -213,8 +213,11 @@ static void mddev_put(mddev_t *mddev)
                 return;
         if (!mddev->raid_disks && list_empty(&mddev->disks)) {
                 list_del(&mddev->all_mddevs);
-                blk_put_queue(mddev->queue);
+                /* that blocks */
+                blk_cleanup_queue(mddev->queue);
+                /* that also blocks */
                 kobject_unregister(&mddev->kobj);
+                /* result blows... */
         }
         spin_unlock(&all_mddevs_lock);
 }