LU-15076 socklnd: lock ksnc_tx_queue list processing

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

diff --git a/lustre/tests/mirror_io.c b/lustre/tests/mirror_io.c
index 903a4f7..f7035c0 100644 (file)
--- a/lustre/tests/mirror_io.c
+++ b/lustre/tests/mirror_io.c
@@ -45,7 +45,7 @@
 #include <sys/param.h>
 #include <err.h>
 
-#include <uapi/linux/lustre/lustre_idl.h>
+#include <linux/lustre/lustre_idl.h>
 #include <lustre/lustreapi.h>
 
 #define syserr(exp, str, args...)                                      \
@@ -204,7 +204,7 @@ static void mirror_dump(int argc, char *argv[])
        free(buf);
 }
 
-static size_t add_tids(unsigned int *ids, size_t count, char *arg)
+static size_t add_tids(__u16 *ids, size_t count, char *arg)
 {
        while (*arg) {
                char *end;
@@ -240,7 +240,7 @@ static void mirror_copy(int argc, char *argv[])
        int c;
        int i;
 
-       unsigned int ids[4096] = { 0 };
+       __u16 ids[4096] = { 0 };
        size_t count = 0;
        ssize_t result;
 
@@ -364,7 +364,7 @@ ssize_t mirror_resync_one(int fd, struct llapi_layout *layout,
 {
        uint64_t mirror_end = 0;
        ssize_t result = 0;
-       size_t count;
+       uint64_t count;
 
        if (end == OBD_OBJECT_EOF)
                count = OBD_OBJECT_EOF;
@@ -373,7 +373,7 @@ ssize_t mirror_resync_one(int fd, struct llapi_layout *layout,
 
        while (count > 0) {
                uint32_t src;
-               size_t to_copy;
+               uint64_t to_copy;
                ssize_t copied;
 
                src = llapi_mirror_find(layout, start, end, &mirror_end);
@@ -550,6 +550,8 @@ static void mirror_resync(int argc, char *argv[])
 
        rc = llapi_lease_set(fd, ioc);
        syserr(rc <= 0, "llapi_lease_set resync failed");
+       if (rc <= 0)
+               llapi_lease_release(fd);
 
        free(ioc);
        close(fd);