Skip to content

Commit

Permalink
block, xen/blkback: remove blk_[get|put]_queue calls.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Konrad Rzeszutek Wilk committed Apr 18, 2011
1 parent 6fd17b5 commit d2436ed
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 8 deletions.
2 changes: 0 additions & 2 deletions block/blk-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
{
Expand Down
6 changes: 0 additions & 6 deletions drivers/xen/blkback/blkback.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -596,15 +592,13 @@ 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++)
submit_bio(operation, biolist[i]);

blk_finish_plug(&plug);
/* Let the I/Os go.. */
blk_put_queue(q);

if (operation == READ)
blkif->st_rd_sect += preq.nr_sects;
Expand Down

0 comments on commit d2436ed

Please sign in to comment.