]> xenbits.xensource.com Git - libvirt.git/commitdiff
sanlock: avoid lockspace setup when auto_disk_lease is off
authorFederico Simoncelli <fsimonce@redhat.com>
Fri, 8 Jul 2011 10:18:35 +0000 (10:18 +0000)
committerEric Blake <eblake@redhat.com>
Fri, 8 Jul 2011 20:49:10 +0000 (14:49 -0600)
When auto_disk_lease is off we should avoid the automatic lockspace
creation.

Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
src/locking/lock_driver_sanlock.c

index cd2bbb5560f0d0318d5296a07ac11371d6bf99b6..29d4176b5569f4991706cf28097cddcefb624345 100644 (file)
@@ -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;