Revert "virlockspace: Allow caller to specify start and length offset in virLockSpace...

This reverts commit afd5a27575e8b6a494d2728552fe0e89c71e32b4.

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

diff --git a/src/locking/lock_daemon_dispatch.c b/src/locking/lock_daemon_dispatch.c
index 10248ec0b576870cfe09f34e734ea7eaa24ee66d..1b479db55dd47489a202911979bc951693777fc5 100644 (file)
--- a/src/locking/lock_daemon_dispatch.c
+++ b/src/locking/lock_daemon_dispatch.c
@@ -50,8 +50,6 @@ virLockSpaceProtocolDispatchAcquireResource(virNetServerPtr server ATTRIBUTE_UNU
         virNetServerClientGetPrivateData(client);
     virLockSpacePtr lockspace;
     unsigned int newFlags;
-    off_t start = 0;
-    off_t len = 1;
 
     virMutexLock(&priv->lock);
 
@@ -86,7 +84,6 @@ virLockSpaceProtocolDispatchAcquireResource(virNetServerPtr server ATTRIBUTE_UNU
     if (virLockSpaceAcquireResource(lockspace,
                                     args->name,
                                     priv->ownerPid,
-                                    start, len,
                                     newFlags) < 0)
         goto cleanup;
 

diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c
index 79fa48d36517e56591535869ec6c18f983ba9166..0736b4b85b8ddbc4527840e77adee364c9e542e5 100644 (file)
--- a/src/util/virlockspace.c
+++ b/src/util/virlockspace.c
@@ -115,10 +115,8 @@ static void virLockSpaceResourceFree(virLockSpaceResourcePtr res)
 static virLockSpaceResourcePtr
 virLockSpaceResourceNew(virLockSpacePtr lockspace,
                         const char *resname,
-                        pid_t owner,
-                        off_t start,
-                        off_t len,
-                        unsigned int flags)
+                        unsigned int flags,
+                        pid_t owner)
 {
     virLockSpaceResourcePtr res;
     bool shared = !!(flags & VIR_LOCK_SPACE_ACQUIRE_SHARED);
@@ -159,7 +157,7 @@ virLockSpaceResourceNew(virLockSpacePtr lockspace,
                 goto error;
             }
 
-            if (virFileLock(res->fd, shared, start, len, false) < 0) {
+            if (virFileLock(res->fd, shared, 0, 1, false) < 0) {
                 if (errno == EACCES || errno == EAGAIN) {
                     virReportError(VIR_ERR_RESOURCE_BUSY,
                                    _("Lockspace resource '%s' is locked"),
@@ -206,7 +204,7 @@ virLockSpaceResourceNew(virLockSpacePtr lockspace,
             goto error;
         }
 
-        if (virFileLock(res->fd, shared, start, len, false) < 0) {
+        if (virFileLock(res->fd, shared, 0, 1, false) < 0) {
             if (errno == EACCES || errno == EAGAIN) {
                 virReportError(VIR_ERR_RESOURCE_BUSY,
                                _("Lockspace resource '%s' is locked"),
@@ -614,8 +612,6 @@ int virLockSpaceDeleteResource(virLockSpacePtr lockspace,
 int virLockSpaceAcquireResource(virLockSpacePtr lockspace,
                                 const char *resname,
                                 pid_t owner,
-                                off_t start,
-                                off_t len,
                                 unsigned int flags)
 {
     int ret = -1;
@@ -645,8 +641,7 @@ int virLockSpaceAcquireResource(virLockSpacePtr lockspace,
         goto cleanup;
     }
 
-    if (!(res = virLockSpaceResourceNew(lockspace, resname,
-                                        owner, start, len, flags)))
+    if (!(res = virLockSpaceResourceNew(lockspace, resname, flags, owner)))
         goto cleanup;
 
     if (virHashAddEntry(lockspace->resources, resname, res) < 0) {

diff --git a/src/util/virlockspace.h b/src/util/virlockspace.h
index 24f2c89be6bd34a1f28f1b4c551182942291b537..041cf203968ae0c8f331e15cf4a1789399138afe 100644 (file)
--- a/src/util/virlockspace.h
+++ b/src/util/virlockspace.h
@@ -22,8 +22,6 @@
 #ifndef __VIR_LOCK_SPACE_H__
 # define __VIR_LOCK_SPACE_H__
 
-# include <sys/types.h>
-
 # include "internal.h"
 # include "virjson.h"
 
@@ -52,8 +50,6 @@ typedef enum {
 int virLockSpaceAcquireResource(virLockSpacePtr lockspace,
                                 const char *resname,
                                 pid_t owner,
-                                off_t start,
-                                off_t len,
                                 unsigned int flags);
 
 int virLockSpaceReleaseResource(virLockSpacePtr lockspace,

diff --git a/tests/virlockspacetest.c b/tests/virlockspacetest.c
index 3c621e7eb01e3ebcf1674929e10173c64f35ad1e..93353be285bad2ebd506dacd7a785bdc45d0b567 100644 (file)
--- a/tests/virlockspacetest.c
+++ b/tests/virlockspacetest.c
@@ -98,8 +98,6 @@ static int testLockSpaceResourceLockExcl(const void *args ATTRIBUTE_UNUSED)
 {
     virLockSpacePtr lockspace;
     int ret = -1;
-    const off_t start = 0;
-    const off_t len = 1;
 
     rmdir(LOCKSPACE_DIR);
 
@@ -112,13 +110,13 @@ static int testLockSpaceResourceLockExcl(const void *args ATTRIBUTE_UNUSED)
     if (virLockSpaceCreateResource(lockspace, "foo") < 0)
         goto cleanup;
 
-    if (virLockSpaceAcquireResource(lockspace, "foo", geteuid(), start, len, 0) < 0)
+    if (virLockSpaceAcquireResource(lockspace, "foo", geteuid(), 0) < 0)
         goto cleanup;
 
     if (!virFileExists(LOCKSPACE_DIR "/foo"))
         goto cleanup;
 
-    if (virLockSpaceAcquireResource(lockspace, "foo", geteuid(), start, len, 0) == 0)
+    if (virLockSpaceAcquireResource(lockspace, "foo", geteuid(), 0) == 0)
         goto cleanup;
 
     if (virLockSpaceDeleteResource(lockspace, "foo") == 0)
@@ -146,8 +144,6 @@ static int testLockSpaceResourceLockExclAuto(const void *args ATTRIBUTE_UNUSED)
 {
     virLockSpacePtr lockspace;
     int ret = -1;
-    const off_t start = 0;
-    const off_t len = 1;
 
     rmdir(LOCKSPACE_DIR);
 
@@ -161,7 +157,6 @@ static int testLockSpaceResourceLockExclAuto(const void *args ATTRIBUTE_UNUSED)
         goto cleanup;
 
     if (virLockSpaceAcquireResource(lockspace, "foo", geteuid(),
-                                    start, len,
                                     VIR_LOCK_SPACE_ACQUIRE_AUTOCREATE) < 0)
         goto cleanup;
 
@@ -187,8 +182,6 @@ static int testLockSpaceResourceLockShr(const void *args ATTRIBUTE_UNUSED)
 {
     virLockSpacePtr lockspace;
     int ret = -1;
-    const off_t start = 0;
-    const off_t len = 1;
 
     rmdir(LOCKSPACE_DIR);
 
@@ -202,16 +195,13 @@ static int testLockSpaceResourceLockShr(const void *args ATTRIBUTE_UNUSED)
         goto cleanup;
 
     if (virLockSpaceAcquireResource(lockspace, "foo", geteuid(),
-                                    start, len,
                                     VIR_LOCK_SPACE_ACQUIRE_SHARED) < 0)
         goto cleanup;
 
-    if (virLockSpaceAcquireResource(lockspace, "foo",
-                                    geteuid(), start, len, 0) == 0)
+    if (virLockSpaceAcquireResource(lockspace, "foo", geteuid(), 0) == 0)
         goto cleanup;
 
     if (virLockSpaceAcquireResource(lockspace, "foo", geteuid(),
-                                    start, len,
                                     VIR_LOCK_SPACE_ACQUIRE_SHARED) < 0)
         goto cleanup;
 
@@ -246,8 +236,6 @@ static int testLockSpaceResourceLockShrAuto(const void *args ATTRIBUTE_UNUSED)
 {
     virLockSpacePtr lockspace;
     int ret = -1;
-    const off_t start = 0;
-    const off_t len = 1;
 
     rmdir(LOCKSPACE_DIR);
 
@@ -261,7 +249,6 @@ static int testLockSpaceResourceLockShrAuto(const void *args ATTRIBUTE_UNUSED)
         goto cleanup;
 
     if (virLockSpaceAcquireResource(lockspace, "foo", geteuid(),
-                                    start, len,
                                     VIR_LOCK_SPACE_ACQUIRE_SHARED |
                                     VIR_LOCK_SPACE_ACQUIRE_AUTOCREATE) < 0)
         goto cleanup;
@@ -270,7 +257,6 @@ static int testLockSpaceResourceLockShrAuto(const void *args ATTRIBUTE_UNUSED)
         goto cleanup;
 
     if (virLockSpaceAcquireResource(lockspace, "foo", geteuid(),
-                                    start, len,
                                     VIR_LOCK_SPACE_ACQUIRE_AUTOCREATE) == 0)
         goto cleanup;
 
@@ -278,7 +264,6 @@ static int testLockSpaceResourceLockShrAuto(const void *args ATTRIBUTE_UNUSED)
         goto cleanup;
 
     if (virLockSpaceAcquireResource(lockspace, "foo", geteuid(),
-                                    start, len,
                                     VIR_LOCK_SPACE_ACQUIRE_SHARED |
                                     VIR_LOCK_SPACE_ACQUIRE_AUTOCREATE) < 0)
         goto cleanup;
@@ -311,8 +296,6 @@ static int testLockSpaceResourceLockPath(const void *args ATTRIBUTE_UNUSED)
 {
     virLockSpacePtr lockspace;
     int ret = -1;
-    const off_t start = 0;
-    const off_t len = 1;
 
     rmdir(LOCKSPACE_DIR);
 
@@ -325,15 +308,13 @@ static int testLockSpaceResourceLockPath(const void *args ATTRIBUTE_UNUSED)
     if (virLockSpaceCreateResource(lockspace, LOCKSPACE_DIR "/foo") < 0)
         goto cleanup;
 
-    if (virLockSpaceAcquireResource(lockspace, LOCKSPACE_DIR "/foo",
-                                    geteuid(), start, len, 0) < 0)
+    if (virLockSpaceAcquireResource(lockspace, LOCKSPACE_DIR "/foo", geteuid(), 0) < 0)
         goto cleanup;
 
     if (!virFileExists(LOCKSPACE_DIR "/foo"))
         goto cleanup;
 
-    if (virLockSpaceAcquireResource(lockspace, LOCKSPACE_DIR "/foo",
-                                    geteuid(), start, len, 0) == 0)
+    if (virLockSpaceAcquireResource(lockspace, LOCKSPACE_DIR "/foo", geteuid(), 0) == 0)
         goto cleanup;
 
     if (virLockSpaceDeleteResource(lockspace, LOCKSPACE_DIR "/foo") == 0)