From nobody Sun Feb 8 10:33:58 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1536768567113627.8251367216783; Wed, 12 Sep 2018 09:09:27 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 45BEFC05FF7E; Wed, 12 Sep 2018 16:09:25 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0A76B4115; Wed, 12 Sep 2018 16:09:25 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id AE3C24A46C; Wed, 12 Sep 2018 16:09:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w8CG9Ab4012091 for ; Wed, 12 Sep 2018 12:09:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id 17AC674BBB; Wed, 12 Sep 2018 16:09:10 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-52.phx2.redhat.com [10.3.116.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id CA8E02AA9F for ; Wed, 12 Sep 2018 16:09:09 +0000 (UTC) From: John Ferlan To: libvir-list@redhat.com Date: Wed, 12 Sep 2018 12:09:00 -0400 Message-Id: <20180912160903.17500-3-jferlan@redhat.com> In-Reply-To: <20180912160903.17500-1-jferlan@redhat.com> References: <20180912160903.17500-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.27 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/5] storage: Clean up storagePoolUpdateStateCallback processing X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 12 Sep 2018 16:09:25 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Alter the code path to remove the need to to go cleanup and thus remove the label completely. Signed-off-by: John Ferlan --- src/storage/storage_driver.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 1dbeb213e3..d0e7e6904c 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -111,15 +111,15 @@ storagePoolUpdateStateCallback(virStoragePoolObjPtr o= bj, virStorageBackendPtr backend; char *stateFile; =20 - if (!(stateFile =3D virFileBuildPath(driver->stateDir, def->name, ".xm= l"))) - goto cleanup; - if ((backend =3D virStorageBackendForType(def->type)) =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Missing backend %d"), def->type); - goto cleanup; + return; } =20 + if (!(stateFile =3D virFileBuildPath(driver->stateDir, def->name, ".xm= l"))) + return; + /* Backends which do not support 'checkPool' are considered * inactive by default. */ if (backend->checkPool && @@ -151,8 +151,7 @@ storagePoolUpdateStateCallback(virStoragePoolObjPtr obj, if (!virStoragePoolObjIsActive(obj)) virStoragePoolUpdateInactive(&obj); =20 - cleanup: - if (!active && stateFile) + if (!active) ignore_value(unlink(stateFile)); VIR_FREE(stateFile); =20 --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list