diff options
| author | Jan Beulich <JBeulich@suse.com> | 2012-05-14 16:46:33 +0000 |
|---|---|---|
| committer | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2012-05-17 10:43:33 +0000 |
| commit | ed5477664369c1e9de23b0e7e8f16a418573bd2a (patch) | |
| tree | 9c33b5388625e2a46fd63c9bb76b9d82336fa9e0 | |
| parent | c6961b7d38317fd48a8e86a8c2be4b9aeeb71ac0 (diff) | |
| download | qemu-ed5477664369c1e9de23b0e7e8f16a418573bd2a.zip qemu-ed5477664369c1e9de23b0e7e8f16a418573bd2a.tar.gz qemu-ed5477664369c1e9de23b0e7e8f16a418573bd2a.tar.bz2 | |
xen_disk: properly update stats in ioreq_release()
While for the "normal" case (called from blk_send_response_all())
decrementing requests_finished is correct, doing so in the parse error
case is wrong; requests_inflight needs to be decremented instead.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | hw/xen_disk.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/hw/xen_disk.c b/hw/xen_disk.c index cf06243..07594bc 100644 --- a/hw/xen_disk.c +++ b/hw/xen_disk.c @@ -154,7 +154,7 @@ static void ioreq_finish(struct ioreq *ioreq) blkdev->requests_finished++; } -static void ioreq_release(struct ioreq *ioreq) +static void ioreq_release(struct ioreq *ioreq, bool finish) { struct XenBlkDev *blkdev = ioreq->blkdev; @@ -162,7 +162,11 @@ static void ioreq_release(struct ioreq *ioreq) memset(ioreq, 0, sizeof(*ioreq)); ioreq->blkdev = blkdev; QLIST_INSERT_HEAD(&blkdev->freelist, ioreq, list); - blkdev->requests_finished--; + if (finish) { + blkdev->requests_finished--; + } else { + blkdev->requests_inflight--; + } } /* @@ -457,7 +461,7 @@ static void blk_send_response_all(struct XenBlkDev *blkdev) while (!QLIST_EMPTY(&blkdev->finished)) { ioreq = QLIST_FIRST(&blkdev->finished); send_notify += blk_send_response_one(ioreq); - ioreq_release(ioreq); + ioreq_release(ioreq, true); } if (send_notify) { xen_be_send_notify(&blkdev->xendev); @@ -513,7 +517,7 @@ static void blk_handle_requests(struct XenBlkDev *blkdev) if (blk_send_response_one(ioreq)) { xen_be_send_notify(&blkdev->xendev); } - ioreq_release(ioreq); + ioreq_release(ioreq, false); continue; } |