---

yaml --- r: 273843 b: refs/heads/master c: dda1852 h: refs/heads/master i: 273841: 8e25fbc 273839: 8ff50d5 v: v3
git-mirror · Oct 14, 2011 · 22651f8 · 22651f8
1 parent 1f22800
commit 22651f8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64391b2536ca92f9c589b2bfeaca3954896fe057
+refs/heads/master: dda1852802a6cc6fdecb9021e491b2de680c76b9
diff --git a/trunk/drivers/block/xen-blkback/blkback.c b/trunk/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;
 
 	/*