From: Maxim Levitsky <mlevitsk@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Maxim Levitsky <mlevitsk@redhat.com>,
Alberto Garcia <berto@igalia.com>,
qemu-block@nongnu.org, Max Reitz <mreitz@redhat.com>
Subject: [PATCH v4 3/4] crypto: luks: use bdrv_co_delete_file_noerr
Date: Wed, 9 Dec 2020 18:44:40 +0200 [thread overview]
Message-ID: <20201209164441.867945-4-mlevitsk@redhat.com> (raw)
In-Reply-To: <20201209164441.867945-1-mlevitsk@redhat.com>
This refactoring is now possible thanks to this function.
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
---
block/crypto.c | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/block/crypto.c b/block/crypto.c
index b3a5275132..1d30fde38e 100644
--- a/block/crypto.c
+++ b/block/crypto.c
@@ -725,19 +725,8 @@ fail:
* If an error occurred, delete 'filename'. Even if the file existed
* beforehand, it has been truncated and corrupted in the process.
*/
- if (ret && bs) {
- Error *local_delete_err = NULL;
- int r_del = bdrv_co_delete_file(bs, &local_delete_err);
- /*
- * ENOTSUP will happen if the block driver doesn't support
- * the 'bdrv_co_delete_file' interface. This is a predictable
- * scenario and shouldn't be reported back to the user.
- */
- if ((r_del < 0) && (r_del != -ENOTSUP)) {
- error_report_err(local_delete_err);
- } else {
- error_free(local_delete_err);
- }
+ if (ret) {
+ bdrv_co_delete_file_noerr(bs);
}
bdrv_unref(bs);
--
2.26.2
next prev parent reply other threads:[~2020-12-09 16:53 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-09 16:44 [PATCH v4 0/4] qcow2: don't leave partially initialized file on image creation Maxim Levitsky
2020-12-09 16:44 ` [PATCH v4 1/4] crypto: luks: Fix tiny memory leak Maxim Levitsky
2020-12-09 16:44 ` [PATCH v4 2/4] block: add bdrv_co_delete_file_noerr Maxim Levitsky
2020-12-09 17:34 ` Alberto Garcia
2020-12-09 20:26 ` Maxim Levitsky
2020-12-09 16:44 ` Maxim Levitsky [this message]
2020-12-09 17:34 ` [PATCH v4 3/4] crypto: luks: use bdrv_co_delete_file_noerr Alberto Garcia
2020-12-09 16:44 ` [PATCH v4 4/4] block: qcow2: remove the created file on initialization error Maxim Levitsky
2020-12-09 17:41 ` Alberto Garcia
2020-12-09 20:33 ` Maxim Levitsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201209164441.867945-4-mlevitsk@redhat.com \
--to=mlevitsk@redhat.com \
--cc=berto@igalia.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).