diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2008-04-24 20:49:53 +0200 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-05-02 13:50:46 +0200 |
| commit | 2e895e4c23b7f73dba7238db5c5c2dcffb2a4d9d (patch) | |
| tree | 1893fa2ae97e60e0d28f6c467d48006c14f88781 /drivers/block/virtio_blk.c | |
| parent | virtio: fix scatterlist sizing in net driver. (diff) | |
| download | linux-2e895e4c23b7f73dba7238db5c5c2dcffb2a4d9d.tar.xz linux-2e895e4c23b7f73dba7238db5c5c2dcffb2a4d9d.zip | |
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: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers/block/virtio_blk.c')
| -rw-r--r-- | drivers/block/virtio_blk.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index fb283af38023..7e83b6c6e3d6 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -289,7 +289,6 @@ out: 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); |