diff options
| -rw-r--r-- | block/io.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/block/io.c b/block/io.c index 6656d7fe3e..aad7fd30a4 100644 --- a/block/io.c +++ b/block/io.c @@ -1947,6 +1947,7 @@ int bdrv_is_allocated_above(BlockDriverState *top, intermediate = top; while (intermediate && intermediate != base) { int64_t pnum_inter; + int64_t size_inter; int psectors_inter; ret = bdrv_is_allocated(intermediate, sector_num * BDRV_SECTOR_SIZE, @@ -1962,15 +1963,12 @@ int bdrv_is_allocated_above(BlockDriverState *top, return 1; } - /* - * [sector_num, nb_sectors] is unallocated on top but intermediate - * might have - * - * [sector_num+x, nr_sectors] allocated. - */ + size_inter = bdrv_nb_sectors(intermediate); + if (size_inter < 0) { + return size_inter; + } if (n > psectors_inter && - (intermediate == top || - sector_num + psectors_inter < intermediate->total_sectors)) { + (intermediate == top || sector_num + psectors_inter < size_inter)) { n = psectors_inter; } |