Patchwork block: Fix multiwrite with overlapping requests

login
register
mail settings
Submitter Kevin Wolf
Date May 21, 2010, 9:39 a.m.
Message ID <1274434785-7352-1-git-send-email-kwolf@redhat.com>
Download mbox | patch
Permalink /patch/53137/
State New
Headers show

Comments

Kevin Wolf - May 21, 2010, 9:39 a.m.
With overlapping requests, the total number of sectors is smaller than the sum
of the nb_sectors of both requests.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch

diff --git a/block.c b/block.c
index 72d9441..1586b79 100644
--- a/block.c
+++ b/block.c
@@ -2029,7 +2029,7 @@  static int multiwrite_merge(BlockDriverState *bs, BlockRequest *reqs,
             // Add the second request
             qemu_iovec_concat(qiov, reqs[i].qiov, reqs[i].qiov->size);
 
-            reqs[outidx].nb_sectors += reqs[i].nb_sectors;
+            reqs[outidx].nb_sectors = qiov->size >> 9;
             reqs[outidx].qiov = qiov;
 
             mcb->callbacks[i].free_qiov = reqs[outidx].qiov;