From: Federico Simoncelli <fsimonce@redhat.com>
Date: Fri, 8 Jul 2011 10:18:35 +0000 (+0000)
Subject: sanlock: avoid lockspace setup when auto_disk_lease is off
X-Git-Tag: v0.9.4-rc1~266
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de2aa6cfc7f562d634142b26f6b1a0f421cf30ac;p=thirdparty%2Flibvirt.git

sanlock: avoid lockspace setup when auto_disk_lease is off

When auto_disk_lease is off we should avoid the automatic lockspace
creation.

Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
---

diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c
index cd2bbb5560..29d4176b55 100644
--- a/src/locking/lock_driver_sanlock.c
+++ b/src/locking/lock_driver_sanlock.c
@@ -294,8 +294,10 @@ static int virLockManagerSanlockInit(unsigned int version,
         goto error;
     }
 
-    if (virLockManagerSanlockSetupLockspace() < 0)
-        goto error;
+    if (driver->autoDiskLease) {
+        if (virLockManagerSanlockSetupLockspace() < 0)
+            goto error;
+    }
 
     return 0;