summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-04-18 12:04:17 -0400
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-04-18 12:06:14 -0400
commit6fd17b5643bf05c29fc226a5aee96328056fca10 (patch)
treeb7615c4f73da2d0a8d4a0574d6ae83aa540618ec
parente93504933ee6982bdc005fa5c24e1ea330faaf8b (diff)
downloadop-kernel-dev-6fd17b5643bf05c29fc226a5aee96328056fca10.zip
op-kernel-dev-6fd17b5643bf05c29fc226a5aee96328056fca10.tar.gz
xen/blkback: Get the 'requeust_queue' properly.
After the commit 0faa8cca883bbc6a0919e3c89128672659b75820 (" xen/blkback: remove per-queue plugging") we forgot to retrieve the 'struct request_queue' from the block device. This puts the functionality back in and fixes a NULL pointer bug. Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-rw-r--r--drivers/xen/blkback/blkback.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/xen/blkback/blkback.c b/drivers/xen/blkback/blkback.c
index a0d3227..3751325 100644
--- a/drivers/xen/blkback/blkback.c
+++ b/drivers/xen/blkback/blkback.c
@@ -542,6 +542,9 @@ 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
OpenPOWER on IntegriCloud