From 5ff799af305c49517c2f07f3feceec7012f048f2 Mon Sep 17 00:00:00 2001
From: Asias He <asias@redhat.com>
Date: Fri, 25 May 2012 10:34:47 +0800
Subject: [PATCH] --- yaml --- r: 319819 b: refs/heads/master c:
 02e2b124943648fba0a2ccee5c3656a5653e0151 h: refs/heads/master i:   319817:
 f57aef5f1969ddbbb56b51335f27269f50841703   319815:
 dfd4ec78bb7311dffc68c2475f71240f7835bac7 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/block/virtio_blk.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index bd6c98152d61..e6b0b31d51ee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0bc1a2ef19b45bb23617b203bc631b44609f17ba
+refs/heads/master: 02e2b124943648fba0a2ccee5c3656a5653e0151
diff --git a/trunk/drivers/block/virtio_blk.c b/trunk/drivers/block/virtio_blk.c
index 693187df7601..1bed51712dd1 100644
--- a/trunk/drivers/block/virtio_blk.c
+++ b/trunk/drivers/block/virtio_blk.c
@@ -584,13 +584,13 @@ static void __devexit virtblk_remove(struct virtio_device *vdev)
 	vblk->config_enable = false;
 	mutex_unlock(&vblk->config_lock);
 
+	del_gendisk(vblk->disk);
+
 	/* Stop all the virtqueues. */
 	vdev->config->reset(vdev);
 
 	flush_work(&vblk->config_work);
 
-	del_gendisk(vblk->disk);
-
 	/* Abort requests dispatched to driver. */
 	spin_lock_irqsave(&vblk->lock, flags);
 	while ((vbr = virtqueue_detach_unused_buf(vblk->vq))) {