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

Commit 2e895e4c authored by Marcelo Tosatti's avatar Marcelo Tosatti Committed by Rusty Russell
Browse files

virtio-blk: fix remove oops 



Do not unregister the major at device remove, since there might be
another device instances around.

(qemu) pci_del 0 11
(qemu) ACPI: PCI interrupt for device 0000:00:0b.0 disabled
(qemu) pci_del 0 10
(qemu) ------------[ cut here ]------------
WARNING: at block/genhd.c:126 unregister_blkdev+0x74/0x9e()
ACPI: PCI interrupt for device 0000:00:0a.0 disabled

Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 05271685

drivers/block/virtio_blk.c

+0 −2
Original line number Diff line number Diff line
@@ -289,7 +289,6 @@ static int virtblk_probe(struct virtio_device *vdev) 
static void virtblk_remove(struct virtio_device *vdev)

{

	struct virtio_blk *vblk = vdev->priv;

	int major = vblk->disk->major;



	/* Nothing should be pending. */

	BUG_ON(!list_empty(&vblk->reqs));
@@ -299,7 +298,6 @@ static void virtblk_remove(struct virtio_device *vdev) 


	blk_cleanup_queue(vblk->disk->queue);

	put_disk(vblk->disk);

	unregister_blkdev(major, "virtblk");

	mempool_destroy(vblk->pool);

	vdev->config->del_vq(vblk->vq);

	kfree(vblk);