LU-16500 utils: 'lfs migrate' should select new OSTs

[fs/lustre-release.git] / lustre / tests / swap_lock_test.c

diff --git a/lustre/tests/swap_lock_test.c b/lustre/tests/swap_lock_test.c
index 5ec64e5..ad8103a 100644 (file)
--- a/lustre/tests/swap_lock_test.c
+++ b/lustre/tests/swap_lock_test.c
@@ -43,7 +43,6 @@
 #include <time.h>
 
 #include <lustre/lustreapi.h>
-#include <lustre/lustre_idl.h>
 
 #define ERROR(fmt, ...)                                                        \
        fprintf(stderr, "%s: %s:%d: %s: " fmt "\n",                     \
@@ -96,8 +95,7 @@ static void cleanup(void)
                "rm command returned %d", WEXITSTATUS(rc));
 }
 
-/* Create a filename inside the test directory. Will assert on
- * error. */
+/* Create a filename inside the test directory. Will assert on error. */
 static char *create_file_name(const char *name)
 {
        char *filename;
@@ -110,8 +108,9 @@ static char *create_file_name(const char *name)
 }
 
 /* Create a file of a given size in the test directory, filed with
- * c. Will assert on error. */
-int create_file(const char *name, size_t size, unsigned char c)
+ * character 'c'. Will assert on error.
+ */
+static int create_file(const char *name, size_t size, unsigned char c)
 {
        int fd;
        char *filename;
@@ -202,8 +201,7 @@ static void test11(void)
        close(fd1);
 }
 
-/* Test self swap, on different handles. It's a no-op and will always
- * succeed. */
+/* Test self swap, on different handles. Is a no-op and will always succeed. */
 static void test12(void)
 {
        int rc;
@@ -248,7 +246,8 @@ static void test13(void)
         * operations. In the first swap, fd1 is on Lustre, so the
         * ioctl will succeed, but its processing will eventually fail
         * because fd2 is not on Lustre. In the second swap, the ioctl
-        * request is unknown, so ioctl() will directly fail. */
+        * request is unknown, so ioctl() will directly fail.
+        */
        rc = llapi_fswap_layouts(fd1, fd2, 0, 0, 0);
        ASSERTF(rc == -EINVAL, "llapi_fswap_layouts failed: %s",
                strerror(-rc));
@@ -270,9 +269,9 @@ static void test14(void)
        ASSERTF(rc == -EBADF, "llapi_fswap_layouts failed: %s",
                strerror(-rc));
 
-       /* When run under a shell, rc is -EINVAL. When run under
-        * Lustre test suite, stdin is redirected, and rc is
-        * -ENOTTY. Catch both cases. */
+       /* When run under a shell, rc is -EINVAL. When run under Lustre test
+        * suite, stdin is redirected, and rc is -ENOTTY. Catch both cases.
+        */
        rc = llapi_fswap_layouts(0, 0, 0, 0, 0);
        ASSERTF(rc == -EINVAL || rc == -ENOTTY,
                "llapi_fswap_layouts failed: %s",
@@ -299,7 +298,7 @@ static void test15(void)
 
        fd = create_file("foo1", 1000, 'x');
 
-       rc = llapi_lease_get(fd, LL_LEASE_RDLCK);
+       rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK);
        ASSERTF(rc == 0, "cannot get lease '%s': %s", filename, strerror(-rc));
 
        close(fd);
@@ -308,7 +307,7 @@ static void test15(void)
        fd = open(filename, O_RDONLY);
        ASSERTF(fd >= 0, "open failed for '%s': %s", filename, strerror(errno));
 
-       rc = llapi_lease_get(fd, LL_LEASE_RDLCK);
+       rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK);
        ASSERTF(rc == 0, "cannot get lease '%s': %s", filename, strerror(-rc));
 
        rc = llapi_lease_check(fd);
@@ -321,7 +320,7 @@ static void test15(void)
        fd = open(filename, O_WRONLY);
        ASSERTF(fd >= 0, "open failed for '%s': %s", filename, strerror(errno));
 
-       rc = llapi_lease_get(fd, LL_LEASE_WRLCK);
+       rc = llapi_lease_acquire(fd, LL_LEASE_WRLCK);
        ASSERTF(rc == 0, "cannot get lease '%s': %s", filename, strerror(-rc));
 
        rc = llapi_lease_check(fd);
@@ -334,7 +333,7 @@ static void test15(void)
        fd = open(filename, O_RDWR);
        ASSERTF(fd >= 0, "open failed for '%s': %s", filename, strerror(errno));
 
-       rc = llapi_lease_get(fd, LL_LEASE_RDLCK);
+       rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK);
        ASSERTF(rc == 0, "cannot get lease '%s': %s", filename, strerror(-rc));
 
        rc = llapi_lease_check(fd);
@@ -347,7 +346,7 @@ static void test15(void)
        fd = open(filename, O_RDWR);
        ASSERTF(fd >= 0, "open failed for '%s': %s", filename, strerror(errno));
 
-       rc = llapi_lease_get(fd, LL_LEASE_WRLCK);
+       rc = llapi_lease_acquire(fd, LL_LEASE_WRLCK);
        ASSERTF(rc == 0, "cannot get lease '%s': %s", filename, strerror(-rc));
 
        rc = llapi_lease_check(fd);
@@ -360,7 +359,7 @@ static void test15(void)
        fd = open(filename, O_WRONLY);
        ASSERTF(fd >= 0, "open failed for '%s': %s", filename, strerror(errno));
 
-       rc = llapi_lease_get(fd, LL_LEASE_RDLCK);
+       rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK);
        ASSERTF(rc == -EPERM, "cannot get lease '%s': %s",
                filename, strerror(-rc));
 
@@ -374,7 +373,7 @@ static void test15(void)
        fd = open(filename, O_RDONLY);
        ASSERTF(fd >= 0, "open failed for '%s': %s", filename, strerror(errno));
 
-       rc = llapi_lease_get(fd, LL_LEASE_WRLCK);
+       rc = llapi_lease_acquire(fd, LL_LEASE_WRLCK);
        ASSERTF(rc == -EPERM, "cannot get lease '%s': %s",
                filename, strerror(-rc));
 
@@ -388,10 +387,10 @@ static void test15(void)
        fd = open(filename, O_RDWR);
        ASSERTF(fd >= 0, "open failed for '%s': %s", filename, strerror(errno));
 
-       rc = llapi_lease_get(fd, LL_LEASE_RDLCK);
+       rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK);
        ASSERTF(rc == 0, "cannot get lease '%s': %s", filename, strerror(-rc));
 
-       rc = llapi_lease_get(fd, LL_LEASE_RDLCK);
+       rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK);
        ASSERTF(rc == -EBUSY, "can get lease '%s': %s",
                filename, strerror(-rc));
 
@@ -405,10 +404,10 @@ static void test15(void)
        fd = open(filename, O_RDWR);
        ASSERTF(fd >= 0, "open failed for '%s': %s", filename, strerror(errno));
 
-       rc = llapi_lease_get(fd, LL_LEASE_WRLCK);
+       rc = llapi_lease_acquire(fd, LL_LEASE_WRLCK);
        ASSERTF(rc == 0, "cannot get lease '%s': %s", filename, strerror(-rc));
 
-       rc = llapi_lease_get(fd, LL_LEASE_WRLCK);
+       rc = llapi_lease_acquire(fd, LL_LEASE_WRLCK);
        ASSERTF(rc == -EBUSY, "can get lease '%s': %s",
                filename, strerror(-rc));
 
@@ -422,14 +421,14 @@ static void test15(void)
        fd = open(filename, O_RDWR);
        ASSERTF(fd >= 0, "open failed for '%s': %s", filename, strerror(errno));
 
-       rc = llapi_lease_get(fd, LL_LEASE_RDLCK);
+       rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK);
        ASSERTF(rc == 0, "cannot get lease '%s': %s", filename, strerror(-rc));
 
        rc = llapi_lease_check(fd);
        ASSERTF(rc == LL_LEASE_RDLCK,
                "invalid lease type on '%s': %s", filename, strerror(-rc));
 
-       rc = llapi_lease_put(fd);
+       rc = llapi_lease_release(fd);
        ASSERTF(rc == LL_LEASE_RDLCK, "was not able to put back lease '%s': %s",
                filename, strerror(-rc));
 
@@ -437,7 +436,7 @@ static void test15(void)
        ASSERTF(rc == 0,
                "invalid lease type on '%s': %s", filename, strerror(-rc));
 
-       rc = llapi_lease_get(fd, LL_LEASE_RDLCK);
+       rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK);
        ASSERTF(rc == 0, "cannot get lease '%s': %s", filename, strerror(-rc));
 
        close(fd);
@@ -446,14 +445,14 @@ static void test15(void)
        fd = open(filename, O_RDWR);
        ASSERTF(fd >= 0, "open failed for '%s': %s", filename, strerror(errno));
 
-       rc = llapi_lease_get(fd, LL_LEASE_WRLCK);
+       rc = llapi_lease_acquire(fd, LL_LEASE_WRLCK);
        ASSERTF(rc == 0, "cannot get lease '%s': %s", filename, strerror(-rc));
 
        rc = llapi_lease_check(fd);
        ASSERTF(rc == LL_LEASE_WRLCK,
                "invalid lease type on '%s': %s", filename, strerror(-rc));
 
-       rc = llapi_lease_put(fd);
+       rc = llapi_lease_release(fd);
        ASSERTF(rc == LL_LEASE_WRLCK, "was not able to put back lease '%s': %s",
                filename, strerror(-rc));
 
@@ -461,7 +460,7 @@ static void test15(void)
        ASSERTF(rc == 0,
                "invalid lease type on '%s': %s", filename, strerror(-rc));
 
-       rc = llapi_lease_get(fd, LL_LEASE_WRLCK);
+       rc = llapi_lease_acquire(fd, LL_LEASE_WRLCK);
        ASSERTF(rc == 0, "cannot get lease '%s': %s", filename, strerror(-rc));
 
        close(fd);
@@ -471,20 +470,20 @@ static void test15(void)
        ASSERTF(fd >= 0, "open failed for '%s': %s", filename, strerror(errno));
 
        for (i = 0; i < 1000; i++) {
-               rc = llapi_lease_get(fd, LL_LEASE_WRLCK);
+               rc = llapi_lease_acquire(fd, LL_LEASE_WRLCK);
                ASSERTF(rc == 0, "cannot get lease '%s': %s",
                        filename, strerror(-rc));
 
-               rc = llapi_lease_put(fd);
+               rc = llapi_lease_release(fd);
                ASSERTF(rc == LL_LEASE_WRLCK,
                        "was not able to put back lease '%s': %s",
                        filename, strerror(-rc));
 
-               rc = llapi_lease_get(fd, LL_LEASE_RDLCK);
+               rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK);
                ASSERTF(rc == 0, "cannot get lease '%s': %s",
                        filename, strerror(-rc));
 
-               rc = llapi_lease_put(fd);
+               rc = llapi_lease_release(fd);
                ASSERTF(rc == LL_LEASE_RDLCK,
                        "was not able to put back lease '%s': %s",
                        filename, strerror(-rc));
@@ -496,14 +495,14 @@ static void test15(void)
        fd = open(filename, O_RDWR);
        ASSERTF(fd >= 0, "open failed for '%s': %s", filename, strerror(errno));
 
-       rc = llapi_lease_get(fd, LL_LEASE_WRLCK);
+       rc = llapi_lease_acquire(fd, LL_LEASE_WRLCK);
        ASSERTF(rc == 0, "cannot get lease '%s': %s", filename, strerror(-rc));
 
        rc = llapi_lease_check(fd);
        ASSERTF(rc == LL_LEASE_WRLCK,
                "invalid lease type on '%s': %s", filename, strerror(-rc));
 
-       rc = llapi_lease_put(fd);
+       rc = llapi_lease_release(fd);
        ASSERTF(rc == LL_LEASE_WRLCK, "was not able to put back lease '%s': %s",
                filename, strerror(-rc));
 
@@ -511,7 +510,7 @@ static void test15(void)
        ASSERTF(rc == 0,
                "invalid lease type on '%s': %s", filename, strerror(-rc));
 
-       rc = llapi_lease_get(fd, LL_LEASE_RDLCK);
+       rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK);
        ASSERTF(rc == 0, "cannot get lease '%s': %s", filename, strerror(-rc));
 
        close(fd);
@@ -520,14 +519,14 @@ static void test15(void)
        fd = open(filename, O_RDWR);
        ASSERTF(fd >= 0, "open failed for '%s': %s", filename, strerror(errno));
 
-       rc = llapi_lease_get(fd, LL_LEASE_RDLCK);
+       rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK);
        ASSERTF(rc == 0, "cannot get lease '%s': %s", filename, strerror(-rc));
 
        rc = llapi_lease_check(fd);
        ASSERTF(rc == LL_LEASE_RDLCK,
                "invalid lease type on '%s': %s", filename, strerror(-rc));
 
-       rc = llapi_lease_put(fd);
+       rc = llapi_lease_release(fd);
        ASSERTF(rc == LL_LEASE_RDLCK, "was not able to put back lease '%s': %s",
                filename, strerror(-rc));
 
@@ -535,7 +534,7 @@ static void test15(void)
        ASSERTF(rc == 0,
                "invalid lease type on '%s': %s", filename, strerror(-rc));
 
-       rc = llapi_lease_get(fd, LL_LEASE_WRLCK);
+       rc = llapi_lease_acquire(fd, LL_LEASE_WRLCK);
        ASSERTF(rc == 0, "cannot get lease '%s': %s", filename, strerror(-rc));
 
        close(fd);
@@ -549,7 +548,7 @@ static void test16(void)
        int rc;
        char *filename;
        int fd;
-       lustre_fid fid;
+       struct lu_fid fid;
 
        rc = mkdir(mainpath, 0);
        ASSERTF(rc == 0, "mkdir failed for '%s': %s",
@@ -569,7 +568,7 @@ static void test16(void)
                               O_RDWR | O_NOATIME | O_NONBLOCK | O_NOFOLLOW);
        ASSERTF(fd >= 0, "open failed for '%s': %s", filename, strerror(errno));
 
-       rc = llapi_lease_get(fd, LL_LEASE_RDLCK);
+       rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK);
        ASSERTF(rc == 0, "cannot get lease '%s': %s", filename, strerror(-rc));
 
        close(fd);
@@ -591,7 +590,7 @@ static void test17(void)
        fd = open(mainpath, O_DIRECTORY);
        ASSERTF(fd >= 0, "open failed for '%s': %s", mainpath, strerror(errno));
 
-       rc = llapi_lease_get(fd, LL_LEASE_RDLCK);
+       rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK);
        ASSERTF(rc == -ENOTTY, "can get lease on directory '%s': %s",
                mainpath, strerror(-rc));
 
@@ -601,7 +600,7 @@ static void test17(void)
        fd = open(fsmountdir, O_DIRECTORY);
        ASSERTF(fd >= 0, "open failed for '%s': %s", mainpath, strerror(errno));
 
-       rc = llapi_lease_get(fd, LL_LEASE_RDLCK);
+       rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK);
        ASSERTF(rc == -ENOTTY, "can get lease on directory '%s': %s",
                mainpath, strerror(-rc));
 
@@ -642,8 +641,7 @@ static void test20(void)
        ASSERTF(rc == 0, "llapi_fswap_layouts failed: %s",
                strerror(-rc));
 
-       /* Read from fd1. Its file pointer is now positioned inside
-        * the new data. */
+       /* Read from fd1. file pointer is now positioned inside the new data. */
        rc = read(fd1, buf, 1);
        ASSERTF(rc == 1, "read 1 byte on foo1 failed: %s", strerror(errno));
        ASSERTF(buf[0] == 'y', "invalid data found on foo2: %x", buf[0]);
@@ -654,8 +652,7 @@ static void test20(void)
                "invalid size found: %llu instead of %zu",
                (unsigned long long)stbuf.st_size, foo1_size);
 
-       /* Read from fd2. After the swap, the file pointer is past the
-        * data. */
+       /* Read from fd2. After the swap, the file pointer is past the data. */
        rc = read(fd2, buf, 1);
        ASSERTF(rc == 0, "unexpected read returned rc=%d (errno %s)",
                rc, strerror(errno));
@@ -732,7 +729,8 @@ static void test31(void)
        fd3 = create_file("foo3", foo3_size, 'z');
 
        /* Note: swapping 3 fd this way will be back to original
-        * layouts every 2 loops. */
+        * layouts every 2 loops.
+        */
        for (i = 0; i < 999; i++) {
                rc = llapi_fswap_layouts(fd1, fd2, 0, 0, 0);
                ASSERTF(rc == 0, "llapi_fswap_layouts failed: %s",
@@ -786,7 +784,7 @@ static void test40(void)
        fd1 = create_file("foo1", foo1_size, 'x');
        fd2 = create_file("foo2", foo2_size, 'y');
 
-       rc = llapi_lease_get(fd1, LL_LEASE_RDLCK);
+       rc = llapi_lease_acquire(fd1, LL_LEASE_RDLCK);
        ASSERTF(rc == 0, "cannot get lease '%s': %s", mainpath, strerror(-rc));
 
        rc = llapi_lease_check(fd1);
@@ -800,7 +798,7 @@ static void test40(void)
        rc = llapi_lease_check(fd1);
        ASSERTF(rc == 0, "lease not lost on '%s': %s", mainpath, strerror(-rc));
 
-       rc = llapi_lease_put(fd1);
+       rc = llapi_lease_release(fd1);
        ASSERTF(rc == -ENOLCK,
                "was able to put back lease: %s", strerror(-rc));
 
@@ -863,9 +861,9 @@ static void test42(void)
        ASSERTF(rc == 0, "mkdir failed for '%s': %s",
                mainpath, strerror(errno));
 
-       /* Get dataversion for two files.
-        * Make sure values are different so that the following checks make
-        * sense. */
+       /* Get dataversion for two files. Make sure values are different so that
+        * the following checks make sense.
+        */
        fd1 = create_file("foo1", foo1_size, 'x');
 
        rc = llapi_get_data_version(fd1, &dv1, LL_DV_RD_FLUSH);
@@ -1142,7 +1140,8 @@ static void test54(void)
 }
 
 /* Swap group lock, lock a descriptor, and try to swap with it, on
- * second descriptor. */
+ * second descriptor.
+ */
 static void test55(void)
 {
        int rc;
@@ -1173,8 +1172,7 @@ static void test55(void)
        close(fd2);
 }
 
-/* Swap group lock, lock a descriptor, and try to swap with another
- * one. */
+/* Swap group lock, lock a descriptor, and try to swap with another one. */
 static void test56(void)
 {
        int rc;
@@ -1212,8 +1210,7 @@ static void test56(void)
        close(fd2);
 }
 
-/* Swap group lock, lock both descriptor, and try to swap with another
- * one. */
+/* Swap group lock, lock both descriptor, and try to swap with another one. */
 static void test57(void)
 {
        int rc;
@@ -1252,7 +1249,8 @@ static void test57(void)
 }
 
 /* Swap group lock, lock both descriptor with same gid, and try to
- * swap with it. */
+ * swap with it.
+ */
 static void test58(void)
 {
        int rc;
@@ -1289,8 +1287,7 @@ static void test58(void)
        close(fd2);
 }
 
-/* Swap group lock, lock both descriptor with same gid, and swap with
- * none. */
+/* Swap group lock, lock both descriptor with same gid, and swap with none. */
 static void test59(void)
 {
        int rc;
@@ -1368,7 +1365,8 @@ int main(int argc, char *argv[])
        }
 
        /* Play nice with Lustre test scripts. Non-line buffered output
-        * stream under I/O redirection may appear incorrectly. */
+        * stream under I/O redirection may appear incorrectly.
+        */
        setvbuf(stdout, NULL, _IOLBF, 0);
 
        /* Create a test filename and reuse it. Remove possibly old files. */