virtio_blk: fix race at module removal

If a device appears while module is being removed,
driver will get a callback after we've given up
on the major number.

In theory this means this major number can get reused
by something else, resulting in a conflict.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>

diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 055f3df0b4d0192c4d890341451de70c1f4f5fc8..1f8b111c5dab788ce32e27f165d5330b0e3fb721 100644 (file)
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -884,8 +884,8 @@ out_destroy_workqueue:
 
 static void __exit fini(void)
 {
-       unregister_blkdev(major, "virtblk");
        unregister_virtio_driver(&virtio_blk);
+       unregister_blkdev(major, "virtblk");
        destroy_workqueue(virtblk_wq);
 }
 module_init(init);