[libvirt] [PATCH] sanlock: avoid lockspace setup when auto_disk_lease is off

[Eric Blake]

On 07/08/2011 04:18 AM, Federico Simoncelli wrote:
> When auto_disk_lease is off we should avoid the automatic lockspace
> creation.
> 
> Signed-off-by: Federico Simoncelli <fsimonce at redhat.com>
> ---
>  src/locking/lock_driver_sanlock.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c
> index cd2bbb5..29d4176 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;
> +    }

ACK and pushed.

-- 
Eric Blake   eblake at redhat.com    +1-801-349-2682
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 619 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20110708/ad27a47d/attachment-0001.sig>