From 194358675f2c51eb8851b1933c5f4de09089a561 Mon Sep 17 00:00:00 2001
From: Alex Elder <elder@inktank.com>
Date: Wed, 29 Aug 2012 17:11:06 -0500
Subject: [PATCH] --- yaml --- r: 331654 b: refs/heads/master c:
 98cec111c08d8d52168e28648b4a1c2f5011cd70 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/block/rbd.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2e75dd2f4b34..672bcba9969d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9fcbb80024795dc1a282f11af593ae5aa3d1b67e
+refs/heads/master: 98cec111c08d8d52168e28648b4a1c2f5011cd70
diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c
index 77263681dde2..774a36bb00ed 100644
--- a/trunk/drivers/block/rbd.c
+++ b/trunk/drivers/block/rbd.c
@@ -155,7 +155,6 @@ struct rbd_device {
 
 	int			major;		/* blkdev assigned major */
 	struct gendisk		*disk;		/* blkdev's gendisk and rq */
-	struct request_queue	*q;
 
 	struct rbd_options	rbd_opts;
 	struct rbd_client	*rbd_client;
@@ -1923,7 +1922,6 @@ static int rbd_init_disk(struct rbd_device *rbd_dev)
 	q->queuedata = rbd_dev;
 
 	rbd_dev->disk = disk;
-	rbd_dev->q = q;
 
 	/* finally, announce the disk to the world */
 	set_capacity(disk, total_size / SECTOR_SIZE);