From c7df2437d27b3bafb9111c991f44e2f2cef0951b Mon Sep 17 00:00:00 2001
From: Michal Privoznik <mprivozn@redhat.com>
Date: Fri, 24 May 2019 16:35:40 +0200
Subject: [PATCH] virStoragePoolUpdateInactive: Don't call
 virStoragePoolObjEndAPI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There is no need for this function to call
virStoragePoolObjEndAPI(). The object is perfectly usable after
return from this function. In fact, all callers will call
virStoragePoolObjEndAPI() eventually.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 src/storage/storage_driver.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index 4bdb090d78..9800c92076 100644
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -113,20 +113,17 @@ storagePoolRefreshImpl(virStorageBackendPtr backend,
 
 /**
  * virStoragePoolUpdateInactive:
- * @objptr: pointer to a variable holding the pool object pointer
+ * @obj: pool object
  *
  * This function is supposed to be called after a pool becomes inactive. The
  * function switches to the new config object for persistent pools. Inactive
  * pools are removed.
  */
 static void
-virStoragePoolUpdateInactive(virStoragePoolObjPtr *objptr)
+virStoragePoolUpdateInactive(virStoragePoolObjPtr obj)
 {
-    virStoragePoolObjPtr obj = *objptr;
-
     if (!virStoragePoolObjGetConfigFile(obj)) {
         virStoragePoolObjRemove(driver->pools, obj);
-        virStoragePoolObjEndAPI(objptr);
     } else if (virStoragePoolObjGetNewDef(obj)) {
         virStoragePoolObjDefUseNewDef(obj);
     }
@@ -177,7 +174,7 @@ storagePoolUpdateStateCallback(virStoragePoolObjPtr obj,
     virStoragePoolObjSetActive(obj, active);
 
     if (!virStoragePoolObjIsActive(obj))
-        virStoragePoolUpdateInactive(&obj);
+        virStoragePoolUpdateInactive(obj);
 
     return;
 }
@@ -1087,7 +1084,7 @@ storagePoolDestroy(virStoragePoolPtr pool)
 
     virStoragePoolObjSetActive(obj, false);
 
-    virStoragePoolUpdateInactive(&obj);
+    virStoragePoolUpdateInactive(obj);
 
     ret = 0;
 
@@ -1205,7 +1202,7 @@ storagePoolRefresh(virStoragePoolPtr pool,
                                                 0);
         virStoragePoolObjSetActive(obj, false);
 
-        virStoragePoolUpdateInactive(&obj);
+        virStoragePoolUpdateInactive(obj);
 
         goto cleanup;
     }