Commit 1312f40e11c57edb5c3250f1b782cef8e3efea82
1 parent
6f325a1344
Exists in
master
and in
7 other branches
[PATCH] regularize blk_cleanup_queue() use
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Showing 6 changed files with 15 additions and 12 deletions Side-by-side Diff
drivers/block/loop.c
| ... | ... | @@ -1307,7 +1307,7 @@ |
| 1307 | 1307 | |
| 1308 | 1308 | out_mem4: |
| 1309 | 1309 | while (i--) |
| 1310 | - blk_put_queue(loop_dev[i].lo_queue); | |
| 1310 | + blk_cleanup_queue(loop_dev[i].lo_queue); | |
| 1311 | 1311 | devfs_remove("loop"); |
| 1312 | 1312 | i = max_loop; |
| 1313 | 1313 | out_mem3: |
| ... | ... | @@ -1328,7 +1328,7 @@ |
| 1328 | 1328 | |
| 1329 | 1329 | for (i = 0; i < max_loop; i++) { |
| 1330 | 1330 | del_gendisk(disks[i]); |
| 1331 | - blk_put_queue(loop_dev[i].lo_queue); | |
| 1331 | + blk_cleanup_queue(loop_dev[i].lo_queue); | |
| 1332 | 1332 | put_disk(disks[i]); |
| 1333 | 1333 | } |
| 1334 | 1334 | devfs_remove("loop"); |
drivers/block/pktcdvd.c
| ... | ... | @@ -2514,7 +2514,7 @@ |
| 2514 | 2514 | return 0; |
| 2515 | 2515 | |
| 2516 | 2516 | out_new_dev: |
| 2517 | - blk_put_queue(disk->queue); | |
| 2517 | + blk_cleanup_queue(disk->queue); | |
| 2518 | 2518 | out_mem2: |
| 2519 | 2519 | put_disk(disk); |
| 2520 | 2520 | out_mem: |
| ... | ... | @@ -2555,7 +2555,7 @@ |
| 2555 | 2555 | DPRINTK("pktcdvd: writer %s unmapped\n", pd->name); |
| 2556 | 2556 | |
| 2557 | 2557 | del_gendisk(pd->disk); |
| 2558 | - blk_put_queue(pd->disk->queue); | |
| 2558 | + blk_cleanup_queue(pd->disk->queue); | |
| 2559 | 2559 | put_disk(pd->disk); |
| 2560 | 2560 | |
| 2561 | 2561 | pkt_devs[idx] = NULL; |
drivers/block/umem.c
| ... | ... | @@ -1131,7 +1131,7 @@ |
| 1131 | 1131 | pci_free_consistent(card->dev, PAGE_SIZE*2, |
| 1132 | 1132 | card->mm_pages[1].desc, |
| 1133 | 1133 | card->mm_pages[1].page_dma); |
| 1134 | - blk_put_queue(card->queue); | |
| 1134 | + blk_cleanup_queue(card->queue); | |
| 1135 | 1135 | } |
| 1136 | 1136 | |
| 1137 | 1137 | static const struct pci_device_id mm_pci_ids[] = { { |
drivers/md/dm.c
| ... | ... | @@ -840,7 +840,7 @@ |
| 840 | 840 | bad3: |
| 841 | 841 | mempool_destroy(md->io_pool); |
| 842 | 842 | bad2: |
| 843 | - blk_put_queue(md->queue); | |
| 843 | + blk_cleanup_queue(md->queue); | |
| 844 | 844 | free_minor(minor); |
| 845 | 845 | bad1: |
| 846 | 846 | kfree(md); |
| ... | ... | @@ -860,7 +860,7 @@ |
| 860 | 860 | del_gendisk(md->disk); |
| 861 | 861 | free_minor(minor); |
| 862 | 862 | put_disk(md->disk); |
| 863 | - blk_put_queue(md->queue); | |
| 863 | + blk_cleanup_queue(md->queue); | |
| 864 | 864 | kfree(md); |
| 865 | 865 | } |
| 866 | 866 |
drivers/md/md.c
| ... | ... | @@ -213,8 +213,11 @@ |
| 213 | 213 | return; |
| 214 | 214 | if (!mddev->raid_disks && list_empty(&mddev->disks)) { |
| 215 | 215 | list_del(&mddev->all_mddevs); |
| 216 | - blk_put_queue(mddev->queue); | |
| 216 | + /* that blocks */ | |
| 217 | + blk_cleanup_queue(mddev->queue); | |
| 218 | + /* that also blocks */ | |
| 217 | 219 | kobject_unregister(&mddev->kobj); |
| 220 | + /* result blows... */ | |
| 218 | 221 | } |
| 219 | 222 | spin_unlock(&all_mddevs_lock); |
| 220 | 223 | } |
drivers/s390/block/dcssblk.c
| ... | ... | @@ -273,7 +273,7 @@ |
| 273 | 273 | list_del(&dev_info->lh); |
| 274 | 274 | |
| 275 | 275 | del_gendisk(dev_info->gd); |
| 276 | - blk_put_queue(dev_info->dcssblk_queue); | |
| 276 | + blk_cleanup_queue(dev_info->dcssblk_queue); | |
| 277 | 277 | dev_info->gd->queue = NULL; |
| 278 | 278 | put_disk(dev_info->gd); |
| 279 | 279 | device_unregister(dev); |
| ... | ... | @@ -491,7 +491,7 @@ |
| 491 | 491 | unregister_dev: |
| 492 | 492 | PRINT_ERR("device_create_file() failed!\n"); |
| 493 | 493 | list_del(&dev_info->lh); |
| 494 | - blk_put_queue(dev_info->dcssblk_queue); | |
| 494 | + blk_cleanup_queue(dev_info->dcssblk_queue); | |
| 495 | 495 | dev_info->gd->queue = NULL; |
| 496 | 496 | put_disk(dev_info->gd); |
| 497 | 497 | device_unregister(&dev_info->dev); |
| ... | ... | @@ -505,7 +505,7 @@ |
| 505 | 505 | unload_seg: |
| 506 | 506 | segment_unload(local_buf); |
| 507 | 507 | dealloc_gendisk: |
| 508 | - blk_put_queue(dev_info->dcssblk_queue); | |
| 508 | + blk_cleanup_queue(dev_info->dcssblk_queue); | |
| 509 | 509 | dev_info->gd->queue = NULL; |
| 510 | 510 | put_disk(dev_info->gd); |
| 511 | 511 | free_dev_info: |
| ... | ... | @@ -562,7 +562,7 @@ |
| 562 | 562 | list_del(&dev_info->lh); |
| 563 | 563 | |
| 564 | 564 | del_gendisk(dev_info->gd); |
| 565 | - blk_put_queue(dev_info->dcssblk_queue); | |
| 565 | + blk_cleanup_queue(dev_info->dcssblk_queue); | |
| 566 | 566 | dev_info->gd->queue = NULL; |
| 567 | 567 | put_disk(dev_info->gd); |
| 568 | 568 | device_unregister(&dev_info->dev); |