From nobody Wed Jul 9 23:16:28 2025 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 152164763746146.641006783678904; Wed, 21 Mar 2018 08:53:57 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3616C550CD; Wed, 21 Mar 2018 15:53:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EFD09608F2; Wed, 21 Mar 2018 15:53:55 +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 A56D3181BA04; Wed, 21 Mar 2018 15:53:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2LFrhDR008282 for ; Wed, 21 Mar 2018 11:53:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1BC1484742; Wed, 21 Mar 2018 15:53:43 +0000 (UTC) Received: from unknown54ee7586bd10.attlocal.net.com (ovpn-116-18.phx2.redhat.com [10.3.116.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id D103084740 for ; Wed, 21 Mar 2018 15:53:42 +0000 (UTC) From: John Ferlan To: libvir-list@redhat.com Date: Wed, 21 Mar 2018 11:53:35 -0400 Message-Id: <20180321155335.17203-5-jferlan@redhat.com> In-Reply-To: <20180321155335.17203-1-jferlan@redhat.com> References: <20180321155335.17203-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 4/4] storagepool: Return with locked obj from virStoragePoolObjRemove 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.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 21 Mar 2018 15:53:56 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Rather than unlock the object that was expected to be locked on input, let the caller perform the unlock or more succinctly a virStoragePoolObjEndAPI on the object which will perform the Unref and Unlock and clear the @obj. Also add comments for virStoragePoolObjRemove. Signed-off-by: John Ferlan --- src/conf/virstorageobj.c | 17 ++++++++++++++--- src/storage/storage_driver.c | 12 +----------- src/test/test_driver.c | 14 +++----------- 3 files changed, 18 insertions(+), 25 deletions(-) diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 799b8c9fa3..c057c6b3ed 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -517,6 +517,18 @@ virStoragePoolObjListSearch(virStoragePoolObjListPtr p= ools, } =20 =20 +/* + * virStoragePoolObjRemove: + * @pools: list of storage pool objects + * @obj: a storage pool object + * + * Remove @obj from the storage pool obj list hash tables. The caller must + * hold the lock on @obj to ensure no one else is either waiting for @obj = or + * still using it. + * + * Upon return the @obj remains locked with at least 1 reference and + * the caller is expected to use virStoragePoolObjEndAPI on it. + */ void virStoragePoolObjRemove(virStoragePoolObjListPtr pools, virStoragePoolObjPtr obj) @@ -530,7 +542,6 @@ virStoragePoolObjRemove(virStoragePoolObjListPtr pools, virObjectLock(obj); virHashRemoveEntry(pools->objs, uuidstr); virHashRemoveEntry(pools->objsName, obj->def->name); - virObjectUnlock(obj); virObjectUnref(obj); virObjectRWUnlock(pools); } @@ -1138,13 +1149,13 @@ virStoragePoolObjLoad(virStoragePoolObjListPtr pool= s, VIR_FREE(obj->configFile); /* for driver reload */ if (VIR_STRDUP(obj->configFile, path) < 0) { virStoragePoolObjRemove(pools, obj); - virObjectUnref(obj); + virStoragePoolObjEndAPI(&obj); return NULL; } VIR_FREE(obj->autostartLink); /* for driver reload */ if (VIR_STRDUP(obj->autostartLink, autostartLink) < 0) { virStoragePoolObjRemove(pools, obj); - virObjectUnref(obj); + virStoragePoolObjEndAPI(&obj); return NULL; } =20 diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index d5e38af5aa..b2946d0509 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -94,7 +94,7 @@ virStoragePoolUpdateInactive(virStoragePoolObjPtr *objptr) =20 if (!virStoragePoolObjGetConfigFile(obj)) { virStoragePoolObjRemove(driver->pools, obj); - virObjectUnref(obj); + virStoragePoolObjEndAPI(&obj); *objptr =3D NULL; } else if (virStoragePoolObjGetNewDef(obj)) { virStoragePoolObjDefUseNewDef(obj); @@ -746,8 +746,6 @@ storagePoolCreateXML(virConnectPtr conn, (flags & VIR_STORAGE_POOL_CREATE_WITH_BUILD)) { if (backend->buildPool(obj, build_flags) < 0) { virStoragePoolObjRemove(driver->pools, obj); - virObjectUnref(obj); - obj =3D NULL; goto cleanup; } } @@ -756,8 +754,6 @@ storagePoolCreateXML(virConnectPtr conn, if (backend->startPool && backend->startPool(obj) < 0) { virStoragePoolObjRemove(driver->pools, obj); - virObjectUnref(obj); - obj =3D NULL; goto cleanup; } =20 @@ -771,8 +767,6 @@ storagePoolCreateXML(virConnectPtr conn, if (backend->stopPool) backend->stopPool(obj); virStoragePoolObjRemove(driver->pools, obj); - virObjectUnref(obj); - obj =3D NULL; goto cleanup; } =20 @@ -833,8 +827,6 @@ storagePoolDefineXML(virConnectPtr conn, =20 if (virStoragePoolObjSaveDef(driver, obj, def) < 0) { virStoragePoolObjRemove(driver->pools, obj); - virObjectUnref(obj); - obj =3D NULL; goto cleanup; } =20 @@ -901,8 +893,6 @@ storagePoolUndefine(virStoragePoolPtr pool) =20 VIR_INFO("Undefining storage pool '%s'", def->name); virStoragePoolObjRemove(driver->pools, obj); - virObjectUnref(obj); - obj =3D NULL; ret =3D 0; =20 cleanup: diff --git a/src/test/test_driver.c b/src/test/test_driver.c index a7aaabe09b..4b7f8c4244 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -4556,16 +4556,12 @@ testStoragePoolCreateXML(virConnectPtr conn, def->source.adapter.data.fchost.wwnn, def->source.adapter.data.fchost.wwpn) < 0) { virStoragePoolObjRemove(privconn->pools, obj); - virObjectUnref(obj); - obj =3D NULL; goto cleanup; } } =20 if (testStoragePoolObjSetDefaults(obj) =3D=3D -1) { virStoragePoolObjRemove(privconn->pools, obj); - virObjectUnref(obj); - obj =3D NULL; goto cleanup; } =20 @@ -4627,8 +4623,6 @@ testStoragePoolDefineXML(virConnectPtr conn, =20 if (testStoragePoolObjSetDefaults(obj) =3D=3D -1) { virStoragePoolObjRemove(privconn->pools, obj); - virObjectUnref(obj); - obj =3D NULL; goto cleanup; } =20 @@ -4658,7 +4652,7 @@ testStoragePoolUndefine(virStoragePoolPtr pool) 0); =20 virStoragePoolObjRemove(privconn->pools, obj); - virObjectUnref(obj); + virStoragePoolObjEndAPI(&obj); =20 testObjectEventQueue(privconn, event); return 0; @@ -4750,11 +4744,9 @@ testStoragePoolDestroy(virStoragePoolPtr pool) VIR_STORAGE_POOL_EVENT_STOPPED, 0); =20 - if (!(virStoragePoolObjGetConfigFile(obj))) { + if (!(virStoragePoolObjGetConfigFile(obj))) virStoragePoolObjRemove(privconn->pools, obj); - virObjectUnref(obj); - obj =3D NULL; - } + ret =3D 0; =20 cleanup: --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list