Commit d2436eda authored by Konrad Rzeszutek Wilk's avatar Konrad Rzeszutek Wilk

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: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 6fd17b56
...@@ -351,7 +351,6 @@ void blk_put_queue(struct request_queue *q) ...@@ -351,7 +351,6 @@ void blk_put_queue(struct request_queue *q)
{ {
kobject_put(&q->kobj); kobject_put(&q->kobj);
} }
EXPORT_SYMBOL_GPL(blk_put_queue);
/* /*
* Note: If a driver supplied the queue lock, it should not zap that lock * 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) ...@@ -573,7 +572,6 @@ int blk_get_queue(struct request_queue *q)
return 1; return 1;
} }
EXPORT_SYMBOL_GPL(blk_get_queue);
static inline void blk_free_request(struct request_queue *q, struct request *rq) static inline void blk_free_request(struct request_queue *q, struct request *rq)
{ {
......
...@@ -479,7 +479,6 @@ static void dispatch_rw_block_io(struct blkif_st *blkif, ...@@ -479,7 +479,6 @@ static void dispatch_rw_block_io(struct blkif_st *blkif,
int i, nbio = 0; int i, nbio = 0;
int operation; int operation;
struct blk_plug plug; struct blk_plug plug;
struct request_queue *q;
switch (req->operation) { switch (req->operation) {
case BLKIF_OP_READ: case BLKIF_OP_READ:
...@@ -542,9 +541,6 @@ static void dispatch_rw_block_io(struct blkif_st *blkif, ...@@ -542,9 +541,6 @@ static void dispatch_rw_block_io(struct blkif_st *blkif,
goto fail_response; 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, /* 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 * set gnttab_set_unmap_op on all of the grant references and perform
* the hypercall to unmap the grants - that is all done in * 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, ...@@ -596,7 +592,6 @@ static void dispatch_rw_block_io(struct blkif_st *blkif,
atomic_set(&pending_req->pendcnt, nbio); atomic_set(&pending_req->pendcnt, nbio);
/* Get a reference count for the disk queue and start sending I/O */ /* Get a reference count for the disk queue and start sending I/O */
blk_get_queue(q);
blk_start_plug(&plug); blk_start_plug(&plug);
for (i = 0; i < nbio; i++) for (i = 0; i < nbio; i++)
...@@ -604,7 +599,6 @@ static void dispatch_rw_block_io(struct blkif_st *blkif, ...@@ -604,7 +599,6 @@ static void dispatch_rw_block_io(struct blkif_st *blkif,
blk_finish_plug(&plug); blk_finish_plug(&plug);
/* Let the I/Os go.. */ /* Let the I/Os go.. */
blk_put_queue(q);
if (operation == READ) if (operation == READ)
blkif->st_rd_sect += preq.nr_sects; blkif->st_rd_sect += preq.nr_sects;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment