From: Jan Beulich <jbeulich@suse.com>
Date: Fri, 29 Jun 2012 15:47:34 +0000 (+0100)
Subject: xendisk: properly update stats in ioreq_release()
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d36580ff7ef2041ae393c67dce7040409a7b6900;p=people%2Fliuw%2Flibxenctrl-split%2Fqemu-xen-traditional.git

xendisk: 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.

upstream-commit: ed5477664369c1e9de23b0e7e8f16a418573bd2a

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>
---

diff --git a/hw/xen_disk.c b/hw/xen_disk.c
index 04a62e2e..1a0ae194 100644
--- a/hw/xen_disk.c
+++ b/hw/xen_disk.c
@@ -151,7 +151,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;
 
@@ -159,7 +159,11 @@ static void ioreq_release(struct ioreq *ioreq)
     memset(ioreq, 0, sizeof(*ioreq));
     ioreq->blkdev = blkdev;
     LIST_INSERT_HEAD(&blkdev->freelist, ioreq, list);
-    blkdev->requests_finished--;
+    if (finish) {
+        blkdev->requests_finished--;
+    } else {
+        blkdev->requests_inflight--;
+    }
 }
 
 /*
@@ -487,7 +491,7 @@ static void blk_send_response_all(struct XenBlkDev *blkdev)
     while (!LIST_EMPTY(&blkdev->finished)) {
         ioreq = LIST_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);
@@ -539,7 +543,7 @@ static void blk_handle_requests(struct XenBlkDev *blkdev)
         if (ioreq_parse(ioreq) != 0) {
             if (blk_send_response_one(ioreq))
                 xen_be_send_notify(&blkdev->xendev);
-            ioreq_release(ioreq);
+            ioreq_release(ioreq, false);
             continue;
         }