Commit 92b92799 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

block: Add flags to BlockDriver.bdrv_co_truncate() 



This adds a new BdrvRequestFlags parameter to the .bdrv_co_truncate()
driver callbacks, and a supported_truncate_flags field in
BlockDriverState that allows drivers to advertise support for request
flags in the context of truncate.

For now, we always pass 0 and no drivers declare support for any flag.

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-2-kwolf@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 3fb61087

block/crypto.c

+2 −1
Original line number Diff line number Diff line
@@ -299,7 +299,8 @@ static int block_crypto_co_create_generic(BlockDriverState *bs, 


static int coroutine_fn

block_crypto_co_truncate(BlockDriverState *bs, int64_t offset, bool exact,

                         PreallocMode prealloc, Error **errp)

                         PreallocMode prealloc, BdrvRequestFlags flags,

                         Error **errp)

{

    BlockCrypto *crypto = bs->opaque;

    uint64_t payload_offset =

block/file-posix.c

+1 −1
Original line number Diff line number Diff line
@@ -2080,7 +2080,7 @@ raw_regular_truncate(BlockDriverState *bs, int fd, int64_t offset, 


static int coroutine_fn raw_co_truncate(BlockDriverState *bs, int64_t offset,

                                        bool exact, PreallocMode prealloc,

                                        Error **errp)

                                        BdrvRequestFlags flags, Error **errp)

{

    BDRVRawState *s = bs->opaque;

    struct stat st;

block/file-win32.c

+1 −1
Original line number Diff line number Diff line
@@ -469,7 +469,7 @@ static void raw_close(BlockDriverState *bs) 


static int coroutine_fn raw_co_truncate(BlockDriverState *bs, int64_t offset,

                                        bool exact, PreallocMode prealloc,

                                        Error **errp)

                                        BdrvRequestFlags flags, Error **errp)

{

    BDRVRawState *s = bs->opaque;

    LONG low, high;

block/gluster.c

+1 −0
Original line number Diff line number Diff line
@@ -1228,6 +1228,7 @@ static coroutine_fn int qemu_gluster_co_truncate(BlockDriverState *bs, 
                                                 int64_t offset,

                                                 bool exact,

                                                 PreallocMode prealloc,

                                                 BdrvRequestFlags flags,

                                                 Error **errp)

{

    BDRVGlusterState *s = bs->opaque;

block/io.c

+7 −1
Original line number Diff line number Diff line
@@ -3344,6 +3344,7 @@ int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset, bool exact, 
    BlockDriverState *bs = child->bs;

    BlockDriver *drv = bs->drv;

    BdrvTrackedRequest req;

    BdrvRequestFlags flags = 0;

    int64_t old_size, new_bytes;

    int ret;
@@ -3394,7 +3395,12 @@ int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset, bool exact, 
    }



    if (drv->bdrv_co_truncate) {

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

        if (flags & ~bs->supported_truncate_flags) {

            error_setg(errp, "Block driver does not support requested flags");

            ret = -ENOTSUP;

            goto out;

        }

        ret = drv->bdrv_co_truncate(bs, offset, exact, prealloc, flags, errp);

    } else if (bs->file && drv->is_filter) {

        ret = bdrv_co_truncate(bs->file, offset, exact, prealloc, errp);

    } else {