---

yaml
---
r: 251237
b: refs/heads/master
c: d2436ed
h: refs/heads/master
i:
  251235: 74fd568
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6fd17b5643bf05c29fc226a5aee96328056fca10
+refs/heads/master: d2436eda2e81f1993bfe6349f17f52503bffeff5

trunk/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)
 {

trunk/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,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;