block, xen/blkback: remove blk_[get|put]_queue calls.

They were used to check if the queue does not have QUEUE_FLAG_DEAD
set. That is not necessary anymore as the 'submit_io' call
ends up doing that for us.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

2 files changed, 0 insertions, 8 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index 9b60e69a5400..90f22cc30799 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -351,7 +351,6 @@ void blk_put_queue(struct request_queue *q)
 {
         kobject_put(&q->kobj);
 }
-EXPORT_SYMBOL_GPL(blk_put_queue);
 
 /*
  * Note: If a driver supplied the queue lock, it should not zap that lock
@@ -573,7 +572,6 @@ int blk_get_queue(struct request_queue *q)
 
         return 1;
 }
-EXPORT_SYMBOL_GPL(blk_get_queue);
 
 static inline void blk_free_request(struct request_queue *q, struct request *rq)
 {
diff --git a/drivers/xen/blkback/blkback.c b/drivers/xen/blkback/blkback.c
index 3751325bfc32..59a2bae0f35e 100644
--- a/drivers/xen/blkback/blkback.c
+++ b/drivers/xen/blkback/blkback.c
@@ -479,7 +479,6 @@ static void dispatch_rw_block_io(struct blkif_st *blkif,
         int i, nbio = 0;
         int operation;
         struct blk_plug plug;
-        struct request_queue *q;
 
         switch (req->operation) {
         case BLKIF_OP_READ:
@@ -542,9 +541,6 @@ static void dispatch_rw_block_io(struct blkif_st *blkif,
                         goto fail_response;
                 }
         }
-        q = bdev_get_queue(preq.bdev);
-        if (!q)
-                goto fail_response;
         /* If we have failed at this point, we need to undo the M2P override,
          * set gnttab_set_unmap_op on all of the grant references and perform
          * the hypercall to unmap the grants - that is all done in
@@ -596,7 +592,6 @@ static void dispatch_rw_block_io(struct blkif_st *blkif,
         atomic_set(&pending_req->pendcnt, nbio);
 
         /* Get a reference count for the disk queue and start sending I/O */
-        blk_get_queue(q);
         blk_start_plug(&plug);
 
         for (i = 0; i < nbio; i++)
@@ -604,7 +599,6 @@ static void dispatch_rw_block_io(struct blkif_st *blkif,
 
         blk_finish_plug(&plug);
         /* Let the I/Os go.. */
-        blk_put_queue(q);
 
         if (operation == READ)
                 blkif->st_rd_sect += preq.nr_sects;