From nobody Mon Feb 9 00:42:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1607547579; cv=none; d=zohomail.com; s=zohoarc; b=lGB5sNE6/Zm+4GQno54NWe1qtcZxeFWKqhrPFMRM1TtKUaXLUbN26RrSMwD/ae0ShkP0C4O4nHSfQWPZ2O25x7NoXb5dRcPwb21j0CTqgtymVyNrorDm5Q19jK9mDCIFwy6JHrIMA2stAFmt5O1X0psHvoSt9Si6WXQpROyOuj0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607547579; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=H0bkLbIyLsag+SmCIrnZRq2F9E+rXmAY+pi4VsVrEP8=; b=Ta1J0OXdtVxWZwGX0jXxN9sRY0TG7Fdqiq5k/1yaBEfUQ9MAwQ6f+WBgaRAH6m3SCJFxV65tx/fFbG/p6Xi4lpGL2+YgZbmWUkgAD8MnnegGmfA50ifwY8ULeXsumMrmHqJMtd7OUoUqza55LNu+H0gpk3AHG0aD5HC3gD3VwU0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1607547579836249.27274825142626; Wed, 9 Dec 2020 12:59:39 -0800 (PST) Received: from localhost ([::1]:36520 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kn2ic-0001Pq-Ki for importer@patchew.org; Wed, 09 Dec 2020 11:53:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60236) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kn2aO-0002sC-Mj for qemu-devel@nongnu.org; Wed, 09 Dec 2020 11:45:06 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:26562) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kn2aG-0003KK-Vw for qemu-devel@nongnu.org; Wed, 09 Dec 2020 11:45:04 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-157-iMV9-93cOoCDtXBuPBcvFw-1; Wed, 09 Dec 2020 11:44:54 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 71C091E7C7; Wed, 9 Dec 2020 16:44:53 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.206.133]) by smtp.corp.redhat.com (Postfix) with ESMTP id 137F15B4A8; Wed, 9 Dec 2020 16:44:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607532296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=H0bkLbIyLsag+SmCIrnZRq2F9E+rXmAY+pi4VsVrEP8=; b=hXODD50TJ7HRJfPPKQMc2QWJMlTEbT8/vg0MBoDzRwO9O0isWI0Jf+7nDoR7SnnlCiiGCX JqDLnxDauyclmUprbfnbtCNosX//RTj20xB5tAmUdoz8GeBDK1D3ZfPgkRSB4kzkWS8OFO 8Jwrbk1nPuANd5eYXhWXHt1pUBJY3SA= X-MC-Unique: iMV9-93cOoCDtXBuPBcvFw-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH v4 3/4] crypto: luks: use bdrv_co_delete_file_noerr Date: Wed, 9 Dec 2020 18:44:40 +0200 Message-Id: <20201209164441.867945-4-mlevitsk@redhat.com> In-Reply-To: <20201209164441.867945-1-mlevitsk@redhat.com> References: <20201209164441.867945-1-mlevitsk@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mlevitsk@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=mlevitsk@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Maxim Levitsky , Alberto Garcia , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This refactoring is now possible thanks to this function. Signed-off-by: Maxim Levitsky Reviewed-by: Alberto Garcia --- 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 =3D NULL; - int r_del =3D 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 !=3D -ENOTSUP)) { - error_report_err(local_delete_err); - } else { - error_free(local_delete_err); - } + if (ret) { + bdrv_co_delete_file_noerr(bs); } =20 bdrv_unref(bs); --=20 2.26.2