Commit 9bffae14 authored by Daniel Henrique Barboza's avatar Daniel Henrique Barboza Committed by Kevin Wolf
Browse files

block: introducing 'bdrv_co_delete_file' interface 



Adding to Block Drivers the capability of being able to clean up
its created files can be useful in certain situations. For the
LUKS driver, for instance, a failure in one of its authentication
steps can leave files in the host that weren't there before.

This patch adds the 'bdrv_co_delete_file' interface to block
drivers and add it to the 'file' driver in file-posix.c. The
implementation is given by 'raw_co_delete_file'.

Suggested-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
Signed-off-by: default avatarDaniel Henrique Barboza <danielhb413@gmail.com>
Message-Id: <20200130213907.2830642-2-danielhb413@gmail.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 6e1da96b

block/file-posix.c

+23 −0
Original line number Diff line number Diff line
@@ -2445,6 +2445,28 @@ static int coroutine_fn raw_co_create_opts(const char *filename, QemuOpts *opts, 
    return raw_co_create(&options, errp);

}



static int coroutine_fn raw_co_delete_file(BlockDriverState *bs,

                                           Error **errp)

{

    struct stat st;

    int ret;



    if (!(stat(bs->filename, &st) == 0) || !S_ISREG(st.st_mode)) {

        error_setg_errno(errp, ENOENT, "%s is not a regular file",

                         bs->filename);

        return -ENOENT;

    }



    ret = unlink(bs->filename);

    if (ret < 0) {

        ret = -errno;

        error_setg_errno(errp, -ret, "Error when deleting file %s",

                         bs->filename);

    }



    return ret;

}



/*

 * Find allocation range in @bs around offset @start.

 * May change underlying file descriptor's file offset.
@@ -3075,6 +3097,7 @@ BlockDriver bdrv_file = { 
    .bdrv_co_block_status = raw_co_block_status,

    .bdrv_co_invalidate_cache = raw_co_invalidate_cache,

    .bdrv_co_pwrite_zeroes = raw_co_pwrite_zeroes,

    .bdrv_co_delete_file = raw_co_delete_file,



    .bdrv_co_preadv         = raw_co_preadv,

    .bdrv_co_pwritev        = raw_co_pwritev,

include/block/block_int.h

+4 −0
Original line number Diff line number Diff line
@@ -314,6 +314,10 @@ struct BlockDriver { 
     */

    int coroutine_fn (*bdrv_co_flush)(BlockDriverState *bs);



    /* Delete a created file. */

    int coroutine_fn (*bdrv_co_delete_file)(BlockDriverState *bs,

                                            Error **errp);



    /*

     * Flushes all data that was already written to the OS all the way down to

     * the disk (for example file-posix.c calls fsync()).