[libvirt] [PATCH v4 11/15] Revert "lock_driver: Introduce VIR_LOCK_MANAGER_RESOURCE_TYPE_METADATA"

[Michal Privoznik]

This reverts commit 997283b54b0e1f599aed3085ceba027eb8110acb.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/locking/lock_driver.h         |  2 --
 src/locking/lock_driver_lockd.c   | 47 +++++++++----------------------
 src/locking/lock_driver_sanlock.c |  3 +-
 3 files changed, 14 insertions(+), 38 deletions(-)

diff --git a/src/locking/lock_driver.h b/src/locking/lock_driver.h
index 9be0abcfba..a9d2041c30 100644
--- a/src/locking/lock_driver.h
+++ b/src/locking/lock_driver.h
@@ -51,8 +51,6 @@ typedef enum {
     VIR_LOCK_MANAGER_RESOURCE_TYPE_DISK = 0,
     /* A lease against an arbitrary resource */
     VIR_LOCK_MANAGER_RESOURCE_TYPE_LEASE = 1,
-    /* The resource to be locked is a metadata */
-    VIR_LOCK_MANAGER_RESOURCE_TYPE_METADATA = 2,
 } virLockManagerResourceType;
 
 typedef enum {
diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c
index d6551e125c..268676c407 100644
--- a/src/locking/lock_driver_lockd.c
+++ b/src/locking/lock_driver_lockd.c
@@ -563,7 +563,7 @@ static int virLockManagerLockDaemonAddResource(virLockManagerPtr lock,
     virLockManagerLockDaemonPrivatePtr priv = lock->privateData;
     char *newName = NULL;
     char *newLockspace = NULL;
-    int newFlags = 0;
+    bool autoCreate = false;
     int ret = -1;
 
     virCheckFlags(VIR_LOCK_MANAGER_RESOURCE_READONLY |
@@ -575,7 +575,7 @@ static int virLockManagerLockDaemonAddResource(virLockManagerPtr lock,
     switch (priv->type) {
     case VIR_LOCK_MANAGER_OBJECT_TYPE_DOMAIN:
 
-        switch ((virLockManagerResourceType) type) {
+        switch (type) {
         case VIR_LOCK_MANAGER_RESOURCE_TYPE_DISK:
             if (params || nparams) {
                 virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@@ -602,7 +602,7 @@ static int virLockManagerLockDaemonAddResource(virLockManagerPtr lock,
                     VIR_DEBUG("Got an LVM UUID %s for %s", newName, name);
                     if (VIR_STRDUP(newLockspace, driver->lvmLockSpaceDir) < 0)
                         goto cleanup;
-                    newFlags |= VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_AUTOCREATE;
+                    autoCreate = true;
                     break;
                 }
                 virResetLastError();
@@ -619,7 +619,7 @@ static int virLockManagerLockDaemonAddResource(virLockManagerPtr lock,
                     VIR_DEBUG("Got an SCSI ID %s for %s", newName, name);
                     if (VIR_STRDUP(newLockspace, driver->scsiLockSpaceDir) < 0)
                         goto cleanup;
-                    newFlags |= VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_AUTOCREATE;
+                    autoCreate = true;
                     break;
                 }
                 virResetLastError();
@@ -631,7 +631,7 @@ static int virLockManagerLockDaemonAddResource(virLockManagerPtr lock,
                     goto cleanup;
                 if (virCryptoHashString(VIR_CRYPTO_HASH_SHA256, name, &newName) < 0)
                     goto cleanup;
-                newFlags |= VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_AUTOCREATE;
+                autoCreate = true;
                 VIR_DEBUG("Using indirect lease %s for %s", newName, name);
             } else {
                 if (VIR_STRDUP(newLockspace, "") < 0)
@@ -676,8 +676,6 @@ static int virLockManagerLockDaemonAddResource(virLockManagerPtr lock,
                 goto cleanup;
 
         }   break;
-
-        case VIR_LOCK_MANAGER_RESOURCE_TYPE_METADATA:
         default:
             virReportError(VIR_ERR_INTERNAL_ERROR,
                            _("Unknown lock manager object type %d for domain lock object"),
@@ -687,29 +685,6 @@ static int virLockManagerLockDaemonAddResource(virLockManagerPtr lock,
         break;
 
     case VIR_LOCK_MANAGER_OBJECT_TYPE_DAEMON:
-        switch ((virLockManagerResourceType) type) {
-        case VIR_LOCK_MANAGER_RESOURCE_TYPE_METADATA:
-            if (params || nparams) {
-                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                               _("Unexpected parameters for metadata resource"));
-                goto cleanup;
-            }
-            if (VIR_STRDUP(newLockspace, "") < 0 ||
-                VIR_STRDUP(newName, name) < 0)
-                goto cleanup;
-            newFlags |= VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_METADATA;
-            break;
-
-        case VIR_LOCK_MANAGER_RESOURCE_TYPE_DISK:
-        case VIR_LOCK_MANAGER_RESOURCE_TYPE_LEASE:
-        default:
-            virReportError(VIR_ERR_INTERNAL_ERROR,
-                           _("Unknown lock manager object type %d for daemon lock object"),
-                           type);
-            goto cleanup;
-        }
-        break;
-
     default:
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("Unknown lock manager object type %d"),
@@ -717,15 +692,19 @@ static int virLockManagerLockDaemonAddResource(virLockManagerPtr lock,
         goto cleanup;
     }
 
-    if (flags & VIR_LOCK_MANAGER_RESOURCE_SHARED)
-        newFlags |= VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_SHARED;
-
     if (VIR_EXPAND_N(priv->resources, priv->nresources, 1) < 0)
         goto cleanup;
 
     VIR_STEAL_PTR(priv->resources[priv->nresources-1].lockspace, newLockspace);
     VIR_STEAL_PTR(priv->resources[priv->nresources-1].name, newName);
-    priv->resources[priv->nresources-1].flags = newFlags;
+
+    if (flags & VIR_LOCK_MANAGER_RESOURCE_SHARED)
+        priv->resources[priv->nresources-1].flags |=
+            VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_SHARED;
+
+    if (autoCreate)
+        priv->resources[priv->nresources-1].flags |=
+            VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_AUTOCREATE;
 
     ret = 0;
  cleanup:
diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c
index b10d8197c5..86efc83b5a 100644
--- a/src/locking/lock_driver_sanlock.c
+++ b/src/locking/lock_driver_sanlock.c
@@ -811,7 +811,7 @@ static int virLockManagerSanlockAddResource(virLockManagerPtr lock,
     if (flags & VIR_LOCK_MANAGER_RESOURCE_READONLY)
         return 0;
 
-    switch ((virLockManagerResourceType) type) {
+    switch (type) {
     case VIR_LOCK_MANAGER_RESOURCE_TYPE_DISK:
         if (driver->autoDiskLease) {
             if (virLockManagerSanlockAddDisk(driver, lock, name, nparams, params,
@@ -835,7 +835,6 @@ static int virLockManagerSanlockAddResource(virLockManagerPtr lock,
             return -1;
         break;
 
-    case VIR_LOCK_MANAGER_RESOURCE_TYPE_METADATA:
     default:
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("Unknown lock manager object type %d for domain lock object"),
-- 
2.18.1