Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-03 10:05:41 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-05 10:04:52 -0700
commit29fcbcb3e028d63c3bb8a396bd696f82803f8053 (patch)
tree53fab10e06799550291a46d423645942d04b3f14
parentaa5ec2292c944b46ac536056b89ddfeb4e35fde3 (diff)
Revert "xen/blkback: Don't trust the handle from the frontend."
This reverts commit c93c85196e2c7001daa8a04b83a9d6dd4febfb59 which is commit 01c681d4c70d64cb72142a2823f27c4146a02e63 upstream. It shouldn't have been applied to the 3.4-stable tree, sorry about that. Reported-by: William Dauchy <wdauchy@gmail.com> Cc: Jan Beulich <jbeulich@suse.com> Cc: Ian Campbell <ian.campbell@citrix.com> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/block/xen-blkback/blkback.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c
index a8773d155c00..4fd1dea07ba0 100644
--- a/drivers/block/xen-blkback/blkback.c
+++ b/drivers/block/xen-blkback/blkback.c
@@ -646,6 +646,7 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,
goto fail_response;
}
+ preq.dev = req->u.rw.handle;
preq.sector_number = req->u.rw.sector_number;
preq.nr_sects = 0;