ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Jan Beulich 2012-05-14 16:46:33 +00:00 committed by Stefano Stabellini
parent c6961b7d38
commit ed54776643
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/xen_disk.c
View File

@ -154,7 +154,7 @@ static void ioreq_finish(struct ioreq *ioreq)
blkdev->requests_finished++; blkdev->requests_finished++;
} }
static void ioreq_release(struct ioreq *ioreq) static void ioreq_release(struct ioreq *ioreq, bool finish)
{ {
struct XenBlkDev *blkdev = ioreq->blkdev; struct XenBlkDev *blkdev = ioreq->blkdev;
@ -162,7 +162,11 @@ static void ioreq_release(struct ioreq *ioreq)
memset(ioreq, 0, sizeof(*ioreq)); memset(ioreq, 0, sizeof(*ioreq));
ioreq->blkdev = blkdev; ioreq->blkdev = blkdev;
QLIST_INSERT_HEAD(&blkdev->freelist, ioreq, list); 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)) { while (!QLIST_EMPTY(&blkdev->finished)) {
ioreq = QLIST_FIRST(&blkdev->finished); ioreq = QLIST_FIRST(&blkdev->finished);
send_notify += blk_send_response_one(ioreq); send_notify += blk_send_response_one(ioreq);
ioreq_release(ioreq); ioreq_release(ioreq, true);
} }
if (send_notify) { if (send_notify) {
xen_be_send_notify(&blkdev->xendev); xen_be_send_notify(&blkdev->xendev);
@ -513,7 +517,7 @@ static void blk_handle_requests(struct XenBlkDev *blkdev)
if (blk_send_response_one(ioreq)) { if (blk_send_response_one(ioreq)) {
xen_be_send_notify(&blkdev->xendev); xen_be_send_notify(&blkdev->xendev);
} }
ioreq_release(ioreq); ioreq_release(ioreq, false);
continue; continue;
} }