diff --git a/[refs] b/[refs]
index cfe5b6dd5c02..f26c037eb21a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e93504933ee6982bdc005fa5c24e1ea330faaf8b
+refs/heads/master: 6fd17b5643bf05c29fc226a5aee96328056fca10
diff --git a/trunk/drivers/xen/blkback/blkback.c b/trunk/drivers/xen/blkback/blkback.c
index a0d3227955c9..3751325bfc32 100644
--- a/trunk/drivers/xen/blkback/blkback.c
+++ b/trunk/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