From 53a2c98a8598def67d615ad937d8f46154dd9739 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Mon, 11 Mar 2013 09:39:55 +0000 Subject: [PATCH] --- yaml --- r: 361979 b: refs/heads/master c: 0e5e098ac22dae38f957e951b70d3cf73beff0f7 h: refs/heads/master i: 361977: cadea1fb9053249bd5eef0a61f39b4e4dfa12ada 361975: c0464d6d3086abcafa26687cb608c9cad60da4a0 v: v3 --- [refs] | 2 +- trunk/drivers/block/xen-blkback/blkback.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index e9bb765fd177..618ed8895fd1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 986cacbd26abe5d498be922cd6632f1ec376c271 +refs/heads/master: 0e5e098ac22dae38f957e951b70d3cf73beff0f7 diff --git a/trunk/drivers/block/xen-blkback/blkback.c b/trunk/drivers/block/xen-blkback/blkback.c index eaccc222a1dc..477a17c20820 100644 --- a/trunk/drivers/block/xen-blkback/blkback.c +++ b/trunk/drivers/block/xen-blkback/blkback.c @@ -1001,13 +1001,7 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif, bio->bi_end_io = end_block_io_op; } - /* - * We set it one so that the last submit_bio does not have to call - * atomic_inc. - */ atomic_set(&pending_req->pendcnt, nbio); - - /* Get a reference count for the disk queue and start sending I/O */ blk_start_plug(&plug); for (i = 0; i < nbio; i++) @@ -1035,6 +1029,7 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif, fail_put_bio: for (i = 0; i < nbio; i++) bio_put(biolist[i]); + atomic_set(&pending_req->pendcnt, 1); __end_block_io_op(pending_req, -EINVAL); msleep(1); /* back off a bit */ return -EIO;