Commit d8b83e37 authored by Denis V. Lunev's avatar Denis V. Lunev Committed by Kevin Wolf
Browse files

parallels: respect error code of bdrv_getlength() in allocate_clusters() 



If we can not get the file length, the state of BDS is broken completely.
Return error to the caller.

Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
CC: Markus Armbruster <armbru@redhat.com>
CC: Kevin Wolf <kwolf@redhat.com>
CC: Max Reitz <mreitz@redhat.com>
CC: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
parent 70d9110b

block/parallels.c

+6 −2
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ static int64_t allocate_clusters(BlockDriverState *bs, int64_t sector_num, 
                                 int nb_sectors, int *pnum)

{

    BDRVParallelsState *s = bs->opaque;

    int64_t pos, space, idx, to_allocate, i;

    int64_t pos, space, idx, to_allocate, i, len;



    pos = block_status(s, sector_num, nb_sectors, pnum);

    if (pos > 0) {
@@ -214,7 +214,11 @@ static int64_t allocate_clusters(BlockDriverState *bs, int64_t sector_num, 
    assert(idx < s->bat_size && idx + to_allocate <= s->bat_size);



    space = to_allocate * s->tracks;

    if (s->data_end + space > bdrv_getlength(bs->file->bs) >> BDRV_SECTOR_BITS) {

    len = bdrv_getlength(bs->file->bs);

    if (len < 0) {

        return len;

    }

    if (s->data_end + space > (len >> BDRV_SECTOR_BITS)) {

        int ret;

        space += s->prealloc_size;

        if (s->prealloc_mode == PRL_PREALLOC_MODE_FALLOCATE) {