---

yaml --- r: 331654 b: refs/heads/master c: 98cec11 h: refs/heads/master v: v3
git-mirror · Oct 1, 2012 · 1943586 · 1943586
1 parent 6a971c7
commit 1943586
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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);