Commit 8c6242b6 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

block-backend: Add flags to blk_truncate() 



Now that node level interface bdrv_truncate() supports passing request
flags to the block driver, expose this on the BlockBackend level, too.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: default avatarAlberto Garcia <berto@igalia.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Message-Id: <20200424125448.63318-4-kwolf@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 7b8e4857

block.c

+2 −1
Original line number Diff line number Diff line
@@ -548,7 +548,8 @@ static int64_t create_file_fallback_truncate(BlockBackend *blk, 
    int64_t size;

    int ret;



    ret = blk_truncate(blk, minimum_size, false, PREALLOC_MODE_OFF, &local_err);

    ret = blk_truncate(blk, minimum_size, false, PREALLOC_MODE_OFF, 0,

                       &local_err);

    if (ret < 0 && ret != -ENOTSUP) {

        error_propagate(errp, local_err);

        return ret;

block/block-backend.c

+2 −2
Original line number Diff line number Diff line
@@ -2137,14 +2137,14 @@ int blk_pwrite_compressed(BlockBackend *blk, int64_t offset, const void *buf, 
}



int blk_truncate(BlockBackend *blk, int64_t offset, bool exact,

                 PreallocMode prealloc, Error **errp)

                 PreallocMode prealloc, BdrvRequestFlags flags, Error **errp)

{

    if (!blk_is_available(blk)) {

        error_setg(errp, "No medium inserted");

        return -ENOMEDIUM;

    }



    return bdrv_truncate(blk->root, offset, exact, prealloc, 0, errp);

    return bdrv_truncate(blk->root, offset, exact, prealloc, flags, errp);

}



int blk_save_vmstate(BlockBackend *blk, const uint8_t *buf,

block/commit.c

+2 −2
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static int coroutine_fn commit_run(Job *job, Error **errp) 
    }



    if (base_len < len) {

        ret = blk_truncate(s->base, len, false, PREALLOC_MODE_OFF, NULL);

        ret = blk_truncate(s->base, len, false, PREALLOC_MODE_OFF, 0, NULL);

        if (ret) {

            goto out;

        }
@@ -458,7 +458,7 @@ int bdrv_commit(BlockDriverState *bs) 
     * grow the backing file image if possible.  If not possible,

     * we must return an error */

    if (length > backing_length) {

        ret = blk_truncate(backing, length, false, PREALLOC_MODE_OFF,

        ret = blk_truncate(backing, length, false, PREALLOC_MODE_OFF, 0,

                           &local_err);

        if (ret < 0) {

            error_report_err(local_err);

block/crypto.c

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static ssize_t block_crypto_init_func(QCryptoBlock *block, 
     * which will be used by the crypto header

     */

    return blk_truncate(data->blk, data->size + headerlen, false,

                        data->prealloc, errp);

                        data->prealloc, 0, errp);

}

block/mirror.c

+1 −1
Original line number Diff line number Diff line
@@ -900,7 +900,7 @@ static int coroutine_fn mirror_run(Job *job, Error **errp) 


        if (s->bdev_length > base_length) {

            ret = blk_truncate(s->target, s->bdev_length, false,

                               PREALLOC_MODE_OFF, NULL);

                               PREALLOC_MODE_OFF, 0, NULL);

            if (ret < 0) {

                goto immediate_exit;

            }