From 6fd17b5643bf05c29fc226a5aee96328056fca10 Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Mon, 18 Apr 2011 12:04:17 -0400
Subject: [PATCH] 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>
---
drivers/xen/blkback/blkback.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/xen/blkback/blkback.c b/drivers/xen/blkback/blkback.c
index a0d3227955c9..3751325bfc32 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
--
2.20.1