From nobody Wed Feb 11 02:53:59 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=huawei.com ARC-Seal: i=1; a=rsa-sha256; t=1672997165; cv=none; d=zohomail.com; s=zohoarc; b=SbYpwPuF2RrtzEUQ/15gug+pCnaUJiEySa9uzRfR7wQ75Qznq9D1r9Y3A8X6pPsc2G3JHi8BF1TTgirdl/zxxL7aN79vEr0l+lepi9P4REyWCEuz36VFVvZwt0U3sy3Tbhiyj7Hrj4IFaLuCahQtGsjJeXsFuN3ukKEbXmS0XWg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672997165; 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=FQWLKvRbGX3RjhZGrGy69LLlRfxhfkx5OZDXZP3Bl2o=; b=Befh0xW+gr+8exWTruSSMSMFtU5myFVEXUcYz0TqBV91nMC63R4qU+qM+0B7I39pXp/wDkeAUZPS3+JRi5zbEZJJcNhqALEmFO3YVvfQLc9Tr83YuBljJjQdPwsWDGHZ2G3ZFbMO0FvTgTsO/rWSAfIrUTsetgBKabWPbSeUycU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 16729971655411015.5444018394905; Fri, 6 Jan 2023 01:26:05 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-308-WPhXZmCJOcqZBUGClOyAXg-1; Fri, 06 Jan 2023 04:25:08 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B58CD282382B; Fri, 6 Jan 2023 09:25:03 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F115492B06; Fri, 6 Jan 2023 09:25:03 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 937EC1946595; Fri, 6 Jan 2023 09:25:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B84E41946586 for ; Fri, 6 Jan 2023 09:24:59 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id AB794492B01; Fri, 6 Jan 2023 09:24:59 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast08.extmail.prod.ext.rdu2.redhat.com [10.11.55.24]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A325D492B00 for ; Fri, 6 Jan 2023 09:24:59 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 84FB13813F2E for ; Fri, 6 Jan 2023 09:24:59 +0000 (UTC) Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-263-kXSf4eXpPKu6iNWVaW4cmg-1; Fri, 06 Jan 2023 04:24:57 -0500 Received: from dggpeml500022.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4NpHvc2dHSzJqqV for ; Fri, 6 Jan 2023 17:23:40 +0800 (CST) Received: from localhost.localdomain (10.175.124.27) by dggpeml500022.china.huawei.com (7.185.36.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Fri, 6 Jan 2023 17:24:53 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672997164; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=FQWLKvRbGX3RjhZGrGy69LLlRfxhfkx5OZDXZP3Bl2o=; b=DQGlGza5rf3Xx8cdZcwXAmJVMASJJTp10S//41lGMJF/24iSXyzQEarybp1MmJznFizPee auAU3XPBoDuZtOtdnu4kjR+kH9yDGEYSRcGwy3o8MgS3orn6SpK4EMRebRWz+11ep0uxW9 SINqOXvXVmuiG0S0aRR2BshCgiipvZ4= X-MC-Unique: WPhXZmCJOcqZBUGClOyAXg-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: kXSf4eXpPKu6iNWVaW4cmg-1 From: Jiang Jiacheng To: Subject: [PATCH 3/9] locking: use g_autofree and remove unnecessary label Date: Fri, 6 Jan 2023 17:18:33 +0800 Message-ID: <20230106091839.1263372-4-jiangjiacheng@huawei.com> In-Reply-To: <20230106091839.1263372-1-jiangjiacheng@huawei.com> References: <20230106091839.1263372-1-jiangjiacheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpeml500022.china.huawei.com (7.185.36.66) X-CFilter-Loop: Reflected X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yubihong@huawei.com, zhengchuan@huawei.com, linyilu@huawei.com, jiangjiacheng@huawei.com, xiexiangyou@huawei.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1672997167002100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiang Jiacheng --- src/locking/lock_driver_lockd.c | 36 +++++++++--------------- src/locking/lock_driver_sanlock.c | 46 ++++++++++++------------------- 2 files changed, 31 insertions(+), 51 deletions(-) diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lock= d.c index e902b01463..4df12e0105 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -190,8 +190,8 @@ static virNetClient *virLockManagerLockDaemonConnection= New(bool privileged, virNetClientP= rogram **prog) { virNetClient *client =3D NULL; - char *lockdpath; - char *daemonPath =3D NULL; + g_autofree char *lockdpath =3D NULL; + g_autofree char *daemonPath =3D NULL; =20 *prog =3D NULL; =20 @@ -220,14 +220,9 @@ static virNetClient *virLockManagerLockDaemonConnectio= nNew(bool privileged, if (virNetClientAddProgram(client, *prog) < 0) goto error; =20 - VIR_FREE(daemonPath); - VIR_FREE(lockdpath); - return client; =20 error: - VIR_FREE(daemonPath); - VIR_FREE(lockdpath); virNetClientClose(client); virObjectUnref(client); virObjectUnref(*prog); @@ -517,10 +512,9 @@ static int virLockManagerLockDaemonAddResource(virLock= Manager *lock, unsigned int flags) { virLockManagerLockDaemonPrivate *priv =3D lock->privateData; - char *newName =3D NULL; - char *newLockspace =3D NULL; + g_autofree char *newName =3D NULL; + g_autofree char *newLockspace =3D NULL; bool autoCreate =3D false; - int ret =3D -1; =20 virCheckFlags(VIR_LOCK_MANAGER_RESOURCE_READONLY | VIR_LOCK_MANAGER_RESOURCE_SHARED, -1); @@ -533,7 +527,7 @@ static int virLockManagerLockDaemonAddResource(virLockM= anager *lock, if (params || nparams) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unexpected parameters for disk resource")); - goto cleanup; + return -1; } if (!driver->autoDiskLease) { if (!(flags & (VIR_LOCK_MANAGER_RESOURCE_SHARED | @@ -549,7 +543,7 @@ static int virLockManagerLockDaemonAddResource(virLockM= anager *lock, driver->lvmLockSpaceDir) { VIR_DEBUG("Trying to find an LVM UUID for %s", name); if (virLockManagerGetLVMKey(name, &newName) < 0) - goto cleanup; + return -1; =20 if (newName) { VIR_DEBUG("Got an LVM UUID %s for %s", newName, name); @@ -565,7 +559,7 @@ static int virLockManagerLockDaemonAddResource(virLockM= anager *lock, driver->scsiLockSpaceDir) { VIR_DEBUG("Trying to find an SCSI ID for %s", name); if (virStorageFileGetSCSIKey(name, &newName, false) < 0) - goto cleanup; + return -1; =20 if (newName) { VIR_DEBUG("Got an SCSI ID %s for %s", newName, name); @@ -580,7 +574,7 @@ static int virLockManagerLockDaemonAddResource(virLockM= anager *lock, if (driver->fileLockSpaceDir) { newLockspace =3D g_strdup(driver->fileLockSpaceDir); if (virCryptoHashString(VIR_CRYPTO_HASH_SHA256, name, &newName= ) < 0) - goto cleanup; + return -1; autoCreate =3D true; VIR_DEBUG("Using indirect lease %s for %s", newName, name); } else { @@ -599,7 +593,7 @@ static int virLockManagerLockDaemonAddResource(virLockM= anager *lock, if (params[i].value.ul !=3D 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Offset must be zero for this lock ma= nager")); - goto cleanup; + return -1; } } else if (STREQ(params[i].key, "lockspace")) { lockspace =3D params[i].value.str; @@ -609,13 +603,13 @@ static int virLockManagerLockDaemonAddResource(virLoc= kManager *lock, virReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected parameter %s for lease resour= ce"), params[i].key); - goto cleanup; + return -1; } } if (!path || !lockspace) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing path or lockspace for lease resource= ")); - goto cleanup; + return -1; } newLockspace =3D g_strdup_printf("%s/%s", path, lockspace); newName =3D g_strdup(name); @@ -625,7 +619,7 @@ static int virLockManagerLockDaemonAddResource(virLockM= anager *lock, virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown lock manager object type %d"), type); - goto cleanup; + return -1; } =20 VIR_EXPAND_N(priv->resources, priv->nresources, 1); @@ -640,11 +634,7 @@ static int virLockManagerLockDaemonAddResource(virLock= Manager *lock, priv->resources[priv->nresources-1].flags |=3D VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_AUTOCREATE; =20 - ret =3D 0; - cleanup: - VIR_FREE(newLockspace); - VIR_FREE(newName); - return ret; + return 0; } =20 =20 diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sa= nlock.c index 2dceb1eefc..438779f926 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -118,9 +118,8 @@ virLockManagerSanlockLoadConfig(virLockManagerSanlockDr= iver *driver, const char *configFile) { g_autoptr(virConf) conf =3D NULL; - int ret =3D -1; - char *user =3D NULL; - char *group =3D NULL; + g_autofree char *user =3D NULL; + g_autofree char *group =3D NULL; =20 if (access(configFile, R_OK) =3D=3D -1) { if (errno !=3D ENOENT) { @@ -136,38 +135,34 @@ virLockManagerSanlockLoadConfig(virLockManagerSanlock= Driver *driver, return -1; =20 if (virConfGetValueBool(conf, "auto_disk_leases", &driver->autoDiskLea= se) < 0) - goto cleanup; + return -1; =20 if (virConfGetValueString(conf, "disk_lease_dir", &driver->autoDiskLea= sePath) < 0) - goto cleanup; + return -1; =20 if (virConfGetValueUInt(conf, "host_id", &driver->hostID) < 0) - goto cleanup; + return -1; =20 driver->requireLeaseForDisks =3D !driver->autoDiskLease; if (virConfGetValueBool(conf, "require_lease_for_disks", &driver->requ= ireLeaseForDisks) < 0) - goto cleanup; + return -1; =20 if (virConfGetValueUInt(conf, "io_timeout", &driver->io_timeout) < 0) - goto cleanup; + return -1; =20 if (virConfGetValueString(conf, "user", &user) < 0) - goto cleanup; + return -1; if (user && virGetUserID(user, &driver->user) < 0) - goto cleanup; + return -1; =20 if (virConfGetValueString(conf, "group", &group) < 0) - goto cleanup; + return -1; if (group && virGetGroupID(group, &driver->group) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - VIR_FREE(user); - VIR_FREE(group); - return ret; + return 0; } =20 static int @@ -778,8 +773,7 @@ virLockManagerSanlockRegisterKillscript(int sock, { g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; char *path; - char *args =3D NULL; - int ret =3D -1; + g_autofree char *args =3D NULL; int rv; =20 switch (action) { @@ -796,7 +790,7 @@ virLockManagerSanlockRegisterKillscript(int sock, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Failure action %s is not supported by sanlock"), virDomainLockFailureTypeToString(action)); - goto cleanup; + return -1; } =20 virBufferEscape(&buf, '\\', "\\ ", "%s", vmuri); @@ -820,14 +814,14 @@ virLockManagerSanlockRegisterKillscript(int sock, virReportError(VIR_ERR_INTERNAL_ERROR, _("Sanlock helper path is longer than %d: '%s'"), SANLK_HELPER_PATH_LEN - 1, path); - goto cleanup; + return -1; } if (strlen(args) >=3D SANLK_HELPER_ARGS_LEN) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Sanlock helper arguments are longer than %d:" " '%s'"), SANLK_HELPER_ARGS_LEN - 1, args); - goto cleanup; + return -1; } =20 if ((rv =3D sanlock_killpath(sock, 0, path, args)) < 0) { @@ -842,14 +836,10 @@ virLockManagerSanlockRegisterKillscript(int sock, _("Failed to register lock failure" " action")); } - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - VIR_FREE(args); - return ret; + return 0; } =20 static int virLockManagerSanlockAcquire(virLockManager *lock, --=20 2.33.0