Fix verify state for multiple files

[fio.git] / server.c

diff --git a/server.c b/server.c
index c3e034cee9b5c8a54c6599063cad0a4c6024c430..dcb7c2da61186411e782415e5f5ae26173addd83 100644 (file)
--- a/server.c
+++ b/server.c
@@ -1819,7 +1819,7 @@ void fio_server_send_start(struct thread_data *td)
 }
 
 int fio_server_get_verify_state(const char *name, int threadnumber,
-                               void **datap, int *version)
+                               void **datap)
 {
        struct thread_io_list *s;
        struct cmd_sendfile out;
@@ -1871,7 +1871,7 @@ fail:
         * the header, and the thread_io_list checksum
         */
        s = rep->data + sizeof(struct verify_state_hdr);
-       if (verify_state_hdr(rep->data, s, version)) {
+       if (verify_state_hdr(rep->data, s)) {
                ret = EILSEQ;
                goto fail;
        }
@@ -1916,11 +1916,10 @@ static int fio_init_server_ip(void)
                return -1;
        }
 #ifdef SO_REUSEPORT
-       if (setsockopt(sk, SOL_SOCKET, SO_REUSEPORT, &opt, sizeof(opt)) < 0) {
-               log_err("fio: setsockopt(REUSEPORT): %s\n", strerror(errno));
-               close(sk);
-               return -1;
-       }
+       /*
+        * Not fatal if fails, so just ignore it if that happens
+        */
+       setsockopt(sk, SOL_SOCKET, SO_REUSEPORT, &opt, sizeof(opt));
 #endif
 
        if (use_ipv6) {