]> xenbits.xensource.com Git - libvirt.git/commitdiff
storage: remove unneeded labels
authorDaniel Henrique Barboza <danielhb413@gmail.com>
Mon, 6 Jan 2020 21:57:30 +0000 (18:57 -0300)
committerErik Skultety <eskultet@redhat.com>
Tue, 7 Jan 2020 15:40:41 +0000 (16:40 +0100)
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
src/storage/storage_backend_iscsi_direct.c
src/storage/storage_driver.c

index 2afa617cc1e40ba058dc0c76095aeefe23d422ee..3a5e2bb9f0a554ddfee282d59c40731a56aa6914 100644 (file)
@@ -572,13 +572,11 @@ virStorageBackendISCSIDirectSetConnection(virStoragePoolObjPtr pool,
     if (portalRet)
         *portalRet = g_steal_pointer(&portal);
 
- cleanup:
     return iscsi;
 
  error:
     iscsi_destroy_context(iscsi);
-    iscsi = NULL;
-    goto cleanup;
+    return NULL;
 }
 
 static int
index 6bbf52f729c357f997dece3e814dc333b580cdcb..0bb116cf08c3dcd179fd281c390e9606fe8690a6 100644 (file)
@@ -2771,13 +2771,13 @@ storageConnectStoragePoolEventRegisterAny(virConnectPtr conn,
     int callbackID = -1;
 
     if (virConnectStoragePoolEventRegisterAnyEnsureACL(conn) < 0)
-        goto cleanup;
+        return -1;
 
     if (virStoragePoolEventStateRegisterID(conn, driver->storageEventState,
                                            pool, eventID, callback,
                                            opaque, freecb, &callbackID) < 0)
         callbackID = -1;
- cleanup:
+
     return callbackID;
 }