]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
vsock/test: Use NSEC_PER_SEC
authorMichal Luczaj <mhal@rbox.co>
Thu, 19 Dec 2024 09:49:28 +0000 (10:49 +0100)
committerJakub Kicinski <kuba@kernel.org>
Mon, 23 Dec 2024 18:28:00 +0000 (10:28 -0800)
Replace 1000000000ULL with NSEC_PER_SEC.

No functional change intended.

Reviewed-by: Luigi Leonardi <leonardi@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Michal Luczaj <mhal@rbox.co>
Link: https://patch.msgid.link/20241219-test-vsock-leaks-v4-1-a416e554d9d7@rbox.co
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
tools/testing/vsock/vsock_test.c

index 48f17641ca504316d1199926149c9bd62eb2921d..38fd8d96eb83ef1bd45728cfaac6adb3c1e07cfe 100644 (file)
@@ -22,6 +22,7 @@
 #include <signal.h>
 #include <sys/ioctl.h>
 #include <linux/sockios.h>
+#include <linux/time64.h>
 
 #include "vsock_test_zerocopy.h"
 #include "timeout.h"
@@ -559,7 +560,7 @@ static time_t current_nsec(void)
                exit(EXIT_FAILURE);
        }
 
-       return (ts.tv_sec * 1000000000ULL) + ts.tv_nsec;
+       return (ts.tv_sec * NSEC_PER_SEC) + ts.tv_nsec;
 }
 
 #define RCVTIMEO_TIMEOUT_SEC 1
@@ -599,7 +600,7 @@ static void test_seqpacket_timeout_client(const struct test_opts *opts)
        }
 
        read_overhead_ns = current_nsec() - read_enter_ns -
-                       1000000000ULL * RCVTIMEO_TIMEOUT_SEC;
+                          NSEC_PER_SEC * RCVTIMEO_TIMEOUT_SEC;
 
        if (read_overhead_ns > READ_OVERHEAD_NSEC) {
                fprintf(stderr,