From: Daniel P. Berrange <berrange@redhat.com>
Date: Thu, 2 Jun 2011 13:43:20 +0000 (+0100)
Subject: Fix return value in lock manager hotplug methods
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=09240ef13b53303f159901b61f45af7c9b5348c9;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

Fix return value in lock manager hotplug methods

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
---

diff --git a/src/locking/domain_lock.c b/src/locking/domain_lock.c
index f0a11b7f1..771ed538d 100644
--- a/src/locking/domain_lock.c
+++ b/src/locking/domain_lock.c
@@ -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);