Commit 7ea37c30 authored by Max Reitz's avatar Max Reitz
Browse files

block: Add PreallocMode to bdrv_truncate() 



For block drivers that just pass a truncate request to the underlying
protocol, we can now pass the preallocation mode instead of aborting if
it is not PREALLOC_MODE_OFF.

Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Message-id: 20170613202107.10125-3-mreitz@redhat.com
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 8243ccb7

block.c

+3 −2
Original line number Diff line number Diff line
@@ -3411,7 +3411,8 @@ exit: 
/**

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

 */

int bdrv_truncate(BdrvChild *child, int64_t offset, Error **errp)

int bdrv_truncate(BdrvChild *child, int64_t offset, PreallocMode prealloc,

                  Error **errp)

{

    BlockDriverState *bs = child->bs;

    BlockDriver *drv = bs->drv;
@@ -3434,7 +3435,7 @@ int bdrv_truncate(BdrvChild *child, int64_t offset, Error **errp) 


    assert(!(bs->open_flags & BDRV_O_INACTIVE));



    ret = drv->bdrv_truncate(bs, offset, PREALLOC_MODE_OFF, errp);

    ret = drv->bdrv_truncate(bs, offset, prealloc, errp);

    if (ret == 0) {

        ret = refresh_total_sectors(bs, offset >> BDRV_SECTOR_BITS);

        bdrv_dirty_bitmap_truncate(bs);

block/blkdebug.c

+1 −7
Original line number Diff line number Diff line
@@ -824,13 +824,7 @@ static int64_t blkdebug_getlength(BlockDriverState *bs) 
static int blkdebug_truncate(BlockDriverState *bs, int64_t offset,

                             PreallocMode prealloc, Error **errp)

{

    if (prealloc != PREALLOC_MODE_OFF) {

        error_setg(errp, "Unsupported preallocation mode '%s'",

                   PreallocMode_lookup[prealloc]);

        return -ENOTSUP;

    }



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

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

}



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

block/block-backend.c

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

    }



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

    return bdrv_truncate(blk->root, offset, PREALLOC_MODE_OFF, errp);

}



static void blk_pdiscard_entry(void *opaque)

block/crypto.c

+1 −7
Original line number Diff line number Diff line
@@ -367,15 +367,9 @@ static int block_crypto_truncate(BlockDriverState *bs, int64_t offset, 
    size_t payload_offset =

        qcrypto_block_get_payload_offset(crypto->block);



    if (prealloc != PREALLOC_MODE_OFF) {

        error_setg(errp, "Unsupported preallocation mode '%s'",

                   PreallocMode_lookup[prealloc]);

        return -ENOTSUP;

    }



    offset += payload_offset;



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

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

}



static void block_crypto_close(BlockDriverState *bs)

block/parallels.c

+7 −4
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static int64_t allocate_clusters(BlockDriverState *bs, int64_t sector_num, 
        } else {

            ret = bdrv_truncate(bs->file,

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

                                NULL);

                                PREALLOC_MODE_OFF, NULL);

        }

        if (ret < 0) {

            return ret;
@@ -458,7 +458,8 @@ static int parallels_check(BlockDriverState *bs, BdrvCheckResult *res, 
        res->leaks += count;

        if (fix & BDRV_FIX_LEAKS) {

            Error *local_err = NULL;

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

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

                                PREALLOC_MODE_OFF, &local_err);

            if (ret < 0) {

                error_report_err(local_err);

                res->check_errors++;
@@ -699,7 +700,8 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags, 
    }



    if (!(flags & BDRV_O_RESIZE) || !bdrv_has_zero_init(bs->file->bs) ||

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

            bdrv_truncate(bs->file, bdrv_getlength(bs->file->bs),

                          PREALLOC_MODE_OFF, NULL) != 0) {

        s->prealloc_mode = PRL_PREALLOC_MODE_FALLOCATE;

    }
@@ -742,7 +744,8 @@ static void parallels_close(BlockDriverState *bs) 
    }



    if (bs->open_flags & BDRV_O_RDWR) {

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

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

                      PREALLOC_MODE_OFF, NULL);

    }



    g_free(s->bat_dirty_bmap);