From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 2 Oct 2018 13:10:03 +0000 (+0200)
Subject: Revert "_virLockManagerLockDaemonPrivate: Move @hasRWDisks into dom union"
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a8df96526abfbe263248094c9960f331b689c468;p=libvirt.git

Revert "_virLockManagerLockDaemonPrivate: Move @hasRWDisks into dom union"

This reverts commit aaf34cb9013d6d746f4edf9807408cb9dfbcf01d.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
---

diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c
index 268676c407..22a5a97913 100644
--- a/src/locking/lock_driver_lockd.c
+++ b/src/locking/lock_driver_lockd.c
@@ -63,8 +63,6 @@ struct _virLockManagerLockDaemonPrivate {
             char *name;
             int id;
             pid_t pid;
-
-            bool hasRWDisks;
         } dom;
 
         struct {
@@ -76,6 +74,8 @@ struct _virLockManagerLockDaemonPrivate {
 
     size_t nresources;
     virLockManagerLockDaemonResourcePtr resources;
+
+    bool hasRWDisks;
 };
 
 
@@ -585,7 +585,7 @@ static int virLockManagerLockDaemonAddResource(virLockManagerPtr lock,
             if (!driver->autoDiskLease) {
                 if (!(flags & (VIR_LOCK_MANAGER_RESOURCE_SHARED |
                                VIR_LOCK_MANAGER_RESOURCE_READONLY)))
-                    priv->t.dom.hasRWDisks = true;
+                    priv->hasRWDisks = true;
                 return 0;
             }
 
@@ -731,7 +731,7 @@ static int virLockManagerLockDaemonAcquire(virLockManagerPtr lock,
 
     if (priv->type == VIR_LOCK_MANAGER_OBJECT_TYPE_DOMAIN &&
         priv->nresources == 0 &&
-        priv->t.dom.hasRWDisks &&
+        priv->hasRWDisks &&
         driver->requireLeaseForDisks) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                        _("Read/write, exclusive access, disks were present, but no leases specified"));