Commit 52cdbc58 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

block: Pass BdrvChild to bdrv_truncate() 



Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
parent becc347e

block.c

+2 −1
Original line number Diff line number Diff line
@@ -2626,8 +2626,9 @@ exit: 
/**

 * Truncate file to 'offset' bytes (needed only for file protocols)

 */

int bdrv_truncate(BlockDriverState *bs, int64_t offset)

int bdrv_truncate(BdrvChild *child, int64_t offset)

{

    BlockDriverState *bs = child->bs;

    BlockDriver *drv = bs->drv;

    int ret;

    if (!drv)

block/blkdebug.c

+1 −1
Original line number Diff line number Diff line
@@ -663,7 +663,7 @@ static int64_t blkdebug_getlength(BlockDriverState *bs) 


static int blkdebug_truncate(BlockDriverState *bs, int64_t offset)

{

    return bdrv_truncate(bs->file->bs, offset);

    return bdrv_truncate(bs->file, offset);

}



static void blkdebug_refresh_filename(BlockDriverState *bs, QDict *options)

block/block-backend.c

+1 −1
Original line number Diff line number Diff line
@@ -1605,7 +1605,7 @@ int blk_truncate(BlockBackend *blk, int64_t offset) 
        return -ENOMEDIUM;

    }



    return bdrv_truncate(blk_bs(blk), offset);

    return bdrv_truncate(blk->root, offset);

}



static void blk_pdiscard_entry(void *opaque)

block/crypto.c

+1 −1
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ static int block_crypto_truncate(BlockDriverState *bs, int64_t offset) 


    offset += payload_offset;



    return bdrv_truncate(bs->file->bs, offset);

    return bdrv_truncate(bs->file, offset);

}



static void block_crypto_close(BlockDriverState *bs)

block/parallels.c

+4 −4
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static int64_t allocate_clusters(BlockDriverState *bs, int64_t sector_num, 
                                     s->data_end << BDRV_SECTOR_BITS,

                                     space << BDRV_SECTOR_BITS, 0);

        } else {

            ret = bdrv_truncate(bs->file->bs,

            ret = bdrv_truncate(bs->file,

                                (s->data_end + space) << BDRV_SECTOR_BITS);

        }

        if (ret < 0) {
@@ -449,7 +449,7 @@ static int parallels_check(BlockDriverState *bs, BdrvCheckResult *res, 
                size - res->image_end_offset);

        res->leaks += count;

        if (fix & BDRV_FIX_LEAKS) {

            ret = bdrv_truncate(bs->file->bs, res->image_end_offset);

            ret = bdrv_truncate(bs->file, res->image_end_offset);

            if (ret < 0) {

                res->check_errors++;

                return ret;
@@ -681,7 +681,7 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags, 
        goto fail_options;

    }

    if (!bdrv_has_zero_init(bs->file->bs) ||

            bdrv_truncate(bs->file->bs, bdrv_getlength(bs->file->bs)) != 0) {

            bdrv_truncate(bs->file, bdrv_getlength(bs->file->bs)) != 0) {

        s->prealloc_mode = PRL_PREALLOC_MODE_FALLOCATE;

    }
@@ -724,7 +724,7 @@ static void parallels_close(BlockDriverState *bs) 
    }



    if (bs->open_flags & BDRV_O_RDWR) {

        bdrv_truncate(bs->file->bs, s->data_end << BDRV_SECTOR_BITS);

        bdrv_truncate(bs->file, s->data_end << BDRV_SECTOR_BITS);

    }



    g_free(s->bat_dirty_bmap);