Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1312f40e authored by Al Viro's avatar Al Viro
Browse files

[PATCH] regularize blk_cleanup_queue() use 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 6f325a13

drivers/block/loop.c

+2 −2
Original line number Diff line number Diff line
@@ -1307,7 +1307,7 @@ static int __init loop_init(void) 


out_mem4:

	while (i--)

		blk_put_queue(loop_dev[i].lo_queue);

		blk_cleanup_queue(loop_dev[i].lo_queue);

	devfs_remove("loop");

	i = max_loop;

out_mem3:
@@ -1328,7 +1328,7 @@ static void loop_exit(void) 


	for (i = 0; i < max_loop; i++) {

		del_gendisk(disks[i]);

		blk_put_queue(loop_dev[i].lo_queue);

		blk_cleanup_queue(loop_dev[i].lo_queue);

		put_disk(disks[i]);

	}

	devfs_remove("loop");

drivers/block/pktcdvd.c

+2 −2
Original line number Diff line number Diff line
@@ -2514,7 +2514,7 @@ static int pkt_setup_dev(struct pkt_ctrl_command *ctrl_cmd) 
	return 0;



out_new_dev:

	blk_put_queue(disk->queue);

	blk_cleanup_queue(disk->queue);

out_mem2:

	put_disk(disk);

out_mem:
@@ -2555,7 +2555,7 @@ static int pkt_remove_dev(struct pkt_ctrl_command *ctrl_cmd) 
	DPRINTK("pktcdvd: writer %s unmapped\n", pd->name);



	del_gendisk(pd->disk);

	blk_put_queue(pd->disk->queue);

	blk_cleanup_queue(pd->disk->queue);

	put_disk(pd->disk);



	pkt_devs[idx] = NULL;

drivers/block/umem.c

+1 −1
Original line number Diff line number Diff line
@@ -1131,7 +1131,7 @@ static void mm_pci_remove(struct pci_dev *dev) 
		pci_free_consistent(card->dev, PAGE_SIZE*2,

				    card->mm_pages[1].desc,

				    card->mm_pages[1].page_dma);

	blk_put_queue(card->queue);

	blk_cleanup_queue(card->queue);

}



static const struct pci_device_id mm_pci_ids[] = { {

drivers/md/dm.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

}

drivers/md/md.c

+4 −1
Original line number Diff line number Diff line
@@ -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);

}