[PULL,24/35] block: Reduce bdrv_aligned_preadv() rounding

Commit Message

Kevin Wolf Oct. 26, 2017, 1:17 p.m. UTC

From: Eric Blake <[e-mail]>

Now that bdrv_is_allocated accepts non-aligned inputs, we can
remove the TODO added in commit d6a644bb.

Signed-off-by: Eric Blake <[e-mail]>
Reviewed-by: John Snow <[e-mail]>
Signed-off-by: Kevin Wolf <[e-mail]>
---
 block/io.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

Patch

diff --git a/block/io.c b/block/io.c
index d2cb20d872..3d5ef2cabe 100644
--- a/block/io.c
+++ b/block/io.c
@@ -1124,18 +1124,14 @@  static int coroutine_fn bdrv_aligned_preadv(BdrvChild *child,
     }
 
     if (flags & BDRV_REQ_COPY_ON_READ) {
-        /* TODO: Simplify further once bdrv_is_allocated no longer
-         * requires sector alignment */
-        int64_t start = QEMU_ALIGN_DOWN(offset, BDRV_SECTOR_SIZE);
-        int64_t end = QEMU_ALIGN_UP(offset + bytes, BDRV_SECTOR_SIZE);
         int64_t pnum;
 
-        ret = bdrv_is_allocated(bs, start, end - start, &pnum);
+        ret = bdrv_is_allocated(bs, offset, bytes, &pnum);
         if (ret < 0) {
             goto out;
         }
 
-        if (!ret || pnum != end - start) {
+        if (!ret || pnum != bytes) {
             ret = bdrv_co_do_copy_on_readv(child, offset, bytes, qiov);
             goto out;
         }