[PULL,23/24] block: Fix bdrv_co_truncate overlap check

Message ID 20180710154304.18304-24-kwolf@redhat.com
State New
Headers show
Series
  • [PULL,01/24] block: Poll after drain on attaching a node
Related show

Commit Message

Kevin Wolf July 10, 2018, 3:43 p.m.
From: Fam Zheng <famz@redhat.com>

If we are growing the image and potentially using preallocation for the
new area, we need to make sure that no write requests are made to the
"preallocated" area which is [@old_size, @offset), not
[@offset, offset * 2 - @old_size).

Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/io.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Patch

diff --git a/block/io.c b/block/io.c
index 2832214db4..77d38ca1d3 100644
--- a/block/io.c
+++ b/block/io.c
@@ -3136,7 +3136,8 @@  int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset,
     }
 
     bdrv_inc_in_flight(bs);
-    tracked_request_begin(&req, bs, offset, new_bytes, BDRV_TRACKED_TRUNCATE);
+    tracked_request_begin(&req, bs, offset - new_bytes, new_bytes,
+                          BDRV_TRACKED_TRUNCATE);
 
     /* If we are growing the image and potentially using preallocation for the
      * new area, we need to make sure that no write requests are made to it