提交 09240ef1 编写于 作者: D Daniel P. Berrange

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
上级 13488f55
...@@ -221,6 +221,8 @@ int virDomainLockDiskAttach(virLockManagerPluginPtr plugin, ...@@ -221,6 +221,8 @@ int virDomainLockDiskAttach(virLockManagerPluginPtr plugin,
if (virLockManagerAcquire(lock, NULL, 0) < 0) if (virLockManagerAcquire(lock, NULL, 0) < 0)
goto cleanup; goto cleanup;
ret = 0;
cleanup: cleanup:
virLockManagerFree(lock); virLockManagerFree(lock);
...@@ -240,6 +242,8 @@ int virDomainLockDiskDetach(virLockManagerPluginPtr plugin, ...@@ -240,6 +242,8 @@ int virDomainLockDiskDetach(virLockManagerPluginPtr plugin,
if (virLockManagerRelease(lock, NULL, 0) < 0) if (virLockManagerRelease(lock, NULL, 0) < 0)
goto cleanup; goto cleanup;
ret = 0;
cleanup: cleanup:
virLockManagerFree(lock); virLockManagerFree(lock);
...@@ -260,6 +264,8 @@ int virDomainLockLeaseAttach(virLockManagerPluginPtr plugin, ...@@ -260,6 +264,8 @@ int virDomainLockLeaseAttach(virLockManagerPluginPtr plugin,
if (virLockManagerAcquire(lock, NULL, 0) < 0) if (virLockManagerAcquire(lock, NULL, 0) < 0)
goto cleanup; goto cleanup;
ret = 0;
cleanup: cleanup:
virLockManagerFree(lock); virLockManagerFree(lock);
...@@ -279,6 +285,8 @@ int virDomainLockLeaseDetach(virLockManagerPluginPtr plugin, ...@@ -279,6 +285,8 @@ int virDomainLockLeaseDetach(virLockManagerPluginPtr plugin,
if (virLockManagerRelease(lock, NULL, 0) < 0) if (virLockManagerRelease(lock, NULL, 0) < 0)
goto cleanup; goto cleanup;
ret = 0;
cleanup: cleanup:
virLockManagerFree(lock); virLockManagerFree(lock);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册