---

yaml --- r: 373494 b: refs/heads/master c: a0cab92 h: refs/heads/master v: v3
git-mirror · May 2, 2013 · b60a4d6 · b60a4d6
1 parent 0a7209c
commit b60a4d6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f40eb349e032bee2b6f06e9b6f1dbfae561bd30a
+refs/heads/master: a0cab924324fac8d6414009bc25ce31eeece038e
diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c
@@ -2844,10 +2844,12 @@ static void rbd_free_disk(struct rbd_device *rbd_dev)
 	if (!disk)
 		return;
 
-	if (disk->flags & GENHD_FL_UP)
+	rbd_dev->disk = NULL;
+	if (disk->flags & GENHD_FL_UP) {
 		del_gendisk(disk);
-	if (disk->queue)
-		blk_cleanup_queue(disk->queue);
+		if (disk->queue)
+			blk_cleanup_queue(disk->queue);
+	}
 	put_disk(disk);
 }