From 22651f8586a2a1397a42c078151cbe10dc0a1aaf Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Fri, 14 Oct 2011 12:13:05 -0400 Subject: [PATCH] --- yaml --- r: 273843 b: refs/heads/master c: dda1852802a6cc6fdecb9021e491b2de680c76b9 h: refs/heads/master i: 273841: 8e25fbc56531bdc7fc4bd1eac0e5ada92399e5d4 273839: 8ff50d5c979e0b8b872edddd538add90d34bf278 v: v3 --- [refs] | 2 +- trunk/drivers/block/xen-blkback/blkback.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4b2380feaf4b..fb97487adc7b 100644 --- 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 index 53c81de6f886..a1ee2659d2bc 100644 --- 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; /*