diff --git a/[refs] b/[refs]
index fbd732e85adb..8532b4531b92 100644
--- 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
index 21e84a15ae4c..1704a3b1e4cb 100644
--- 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);
 }