]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
Fix return value in lock manager hotplug methods
authorDaniel P. Berrange <berrange@redhat.com>
Thu, 2 Jun 2011 13:43:20 +0000 (14:43 +0100)
committerDaniel P. Berrange <berrange@redhat.com>
Thu, 2 Jun 2011 16:23:44 +0000 (17:23 +0100)
Refactoring of the lock manager hotplug methods lost the
ret = 0 assignment for successful return path

* src/locking/domain_lock.c: Add missing ret = 0 assignments

src/locking/domain_lock.c

index f0a11b7f14331d5f504fe361bf1d3ce86ad6ff12..771ed538db6937e635875953dcefeefd492585fb 100644 (file)
@@ -221,6 +221,8 @@ int virDomainLockDiskAttach(virLockManagerPluginPtr plugin,
     if (virLockManagerAcquire(lock, NULL, 0) < 0)
         goto cleanup;
 
+    ret = 0;
+
 cleanup:
     virLockManagerFree(lock);
 
@@ -240,6 +242,8 @@ int virDomainLockDiskDetach(virLockManagerPluginPtr plugin,
     if (virLockManagerRelease(lock, NULL, 0) < 0)
         goto cleanup;
 
+    ret = 0;
+
 cleanup:
     virLockManagerFree(lock);
 
@@ -260,6 +264,8 @@ int virDomainLockLeaseAttach(virLockManagerPluginPtr plugin,
     if (virLockManagerAcquire(lock, NULL, 0) < 0)
         goto cleanup;
 
+    ret = 0;
+
 cleanup:
     virLockManagerFree(lock);
 
@@ -279,6 +285,8 @@ int virDomainLockLeaseDetach(virLockManagerPluginPtr plugin,
     if (virLockManagerRelease(lock, NULL, 0) < 0)
         goto cleanup;
 
+    ret = 0;
+
 cleanup:
     virLockManagerFree(lock);