summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-10-14 12:13:05 -0400
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-10-14 12:29:55 -0400
commitdda1852802a6cc6fdecb9021e491b2de680c76b9 (patch)
tree49a4b77a84898dc3a31fe291d9519d4edbe92004 /drivers/block
parent64391b2536ca92f9c589b2bfeaca3954896fe057 (diff)
downloadop-kernel-dev-dda1852802a6cc6fdecb9021e491b2de680c76b9.zip
op-kernel-dev-dda1852802a6cc6fdecb9021e491b2de680c76b9.tar.gz
xen/blkback: Check for proper operation.
The patch titled: "xen/blkback: Fix the inhibition to map pages when discarding sector ranges." had the right idea except that it used the wrong comparison operator. It had == instead of !=. This fixes the bug where all (except discard) operations would have been ignored. Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/xen-blkback/blkback.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c
index 53c81de..a1ee265 100644
--- a/drivers/block/xen-blkback/blkback.c
+++ b/drivers/block/xen-blkback/blkback.c
@@ -707,7 +707,7 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,
* the hypercall to unmap the grants - that is all done in
* xen_blkbk_unmap.
*/
- if (operation == REQ_DISCARD && xen_blkbk_map(req, pending_req, seg))
+ if (operation != REQ_DISCARD && xen_blkbk_map(req, pending_req, seg))
goto fail_flush;
/*
OpenPOWER on IntegriCloud