]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
rbd: kill rbd_dev->q
authorAlex Elder <elder@inktank.com>
Wed, 29 Aug 2012 22:11:06 +0000 (17:11 -0500)
committerAlex Elder <elder@inktank.com>
Mon, 1 Oct 2012 19:30:51 +0000 (14:30 -0500)
A copy of rbd_dev->disk->queue is held in rbd_dev->q, but it's
never actually used.  So get just get rid of the field.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
drivers/block/rbd.c

index 77263681dde2d609146c1cc4ed2b4d6311eeaffa..774a36bb00ed1df9777063fb7f500afd44be8ac4 100644 (file)
@@ -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);