| Message ID | 1464973388-15821-2-git-send-email-eblake@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Am 03.06.2016 um 19:03 hat Eric Blake geschrieben: > Make sure everything is aligned to the passed-in alignment, > not just sectors. Also makes sure that the computation of > max_nb_sectors later in the function will not divide by > zero, by guaranteeing align is at least a sector. > > Signed-off-by: Eric Blake <eblake@redhat.com> Trivial conflict with my work, can rebase. Reviewed-by: Kevin Wolf <kwolf@redhat.com>
diff --git a/block/io.c b/block/io.c index dff4384..81618b9 100644 --- a/block/io.c +++ b/block/io.c @@ -947,8 +947,9 @@ static int coroutine_fn bdrv_aligned_preadv(BlockDriverState *bs, int64_t sector_num = offset >> BDRV_SECTOR_BITS; unsigned int nb_sectors = bytes >> BDRV_SECTOR_BITS; - assert((offset & (BDRV_SECTOR_SIZE - 1)) == 0); - assert((bytes & (BDRV_SECTOR_SIZE - 1)) == 0); + assert(align / BDRV_SECTOR_SIZE); + assert((offset & (align - 1)) == 0); + assert((bytes & (align - 1)) == 0); assert(!qiov || bytes == qiov->size); assert((bs->open_flags & BDRV_O_NO_IO) == 0);
Make sure everything is aligned to the passed-in alignment, not just sectors. Also makes sure that the computation of max_nb_sectors later in the function will not divide by zero, by guaranteeing align is at least a sector. Signed-off-by: Eric Blake <eblake@redhat.com> --- block/io.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)