From 9581770f48911cbe68cfa1a7fa125df2a0a27d02 Mon Sep 17 00:00:00 2001

From: Maxim Levitsky <mlevitsk@redhat.com>

Date: Sun, 31 May 2020 16:40:33 +0100

Subject: [PATCH 5/7] block: introducing 'bdrv_co_delete_file' interface

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: Maxim Levitsky <mlevitsk@redhat.com>

Message-id: <20200531164035.34188-2-mlevitsk@redhat.com>

Patchwork-id: 97057

O-Subject: [RHEL-AV-8.2.1 qemu-kvm PATCH 1/3] block: introducing 'bdrv_co_delete_file' interface

Bugzilla: 1827630

RH-Acked-by: Sergio Lopez Pascual <slp@redhat.com>

RH-Acked-by: John Snow <jsnow@redhat.com>

RH-Acked-by: Eric Blake <eblake@redhat.com>

From: Daniel Henrique Barboza <danielhb413@gmail.com>

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: Daniel P. Berrangé <berrange@redhat.com>

Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>

Message-Id: <20200130213907.2830642-2-danielhb413@gmail.com>

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

(cherry picked from commit 9bffae14df879255329473a7bd578643af2d4c9c)

Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 block/file-posix.c        | 23 +++++++++++++++++++++++

 include/block/block_int.h |  4 ++++

 2 files changed, 27 insertions(+)

diff --git a/block/file-posix.c b/block/file-posix.c

index dd18d40..1609598 100644

--- a/block/file-posix.c

+++ b/block/file-posix.c

@@ -2388,6 +2388,28 @@ static int coroutine_fn raw_co_create_opts(BlockDriver *drv,

     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.

@@ -3019,6 +3041,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,

diff --git a/include/block/block_int.h b/include/block/block_int.h

index 529f153..562dca1 100644

--- a/include/block/block_int.h

+++ b/include/block/block_int.h

@@ -316,6 +316,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()).

-- 

1.8.3.1