LU-13344 lnet: stop using struct timeval

[fs/lustre-release.git] / lnet / lnet / lib-socket.c

diff --git a/lnet/lnet/lib-socket.c b/lnet/lnet/lib-socket.c
index 5974818..a3628da 100644 (file)
--- a/lnet/lnet/lib-socket.c
+++ b/lnet/lnet/lib-socket.c
@@ -41,37 +41,16 @@
 #include <net/sock.h>
 #include <linux/inetdevice.h>
 
+#include <libcfs/linux/linux-time.h>
 #include <libcfs/libcfs.h>
 #include <lnet/lib-lnet.h>
 
-/*
- * kernel 5.1: commit 7f1bc6e95d7840d4305595b3e4025cddda88cee5
- * Y2038 64-bit time.
- *  SO_TIMESTAMP, SO_TIMESTAMPNS and SO_TIMESTAMPING options, the
- *  way they are currently defined, are not y2038 safe.
- *  Subsequent patches in the series add new y2038 safe versions
- *  of these options which provide 64 bit timestamps on all
- *  architectures uniformly.
- *  Hence, rename existing options with OLD tag suffixes.
- *
- * NOTE: When updating to timespec64 change change these to '_NEW'.
- *
- */
-#ifndef SO_SNDTIMEO
-#define SO_SNDTIMEO SO_SNDTIMEO_OLD
-#endif
-
-#ifndef SO_RCVTIMEO
-#define SO_RCVTIMEO SO_RCVTIMEO_OLD
-#endif
-
 int
 lnet_sock_write(struct socket *sock, void *buffer, int nob, int timeout)
 {
-       int             rc;
-       long            jiffies_left = cfs_time_seconds(timeout);
-       unsigned long   then;
-       struct timeval  tv;
+       int rc;
+       long jiffies_left = cfs_time_seconds(timeout);
+       unsigned long then;
 
        LASSERT(nob > 0);
        /* Caller may pass a zero timeout if she thinks the socket buffer is
@@ -87,16 +66,12 @@ lnet_sock_write(struct socket *sock, void *buffer, int nob, int timeout)
                };
 
                if (timeout != 0) {
+                       struct sock *sk = sock->sk;
+
                        /* Set send timeout to remaining time */
-                       jiffies_to_timeval(jiffies_left, &tv);
-                       rc = kernel_setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO,
-                                              (char *)&tv, sizeof(tv));
-                       if (rc != 0) {
-                               CERROR("Can't set socket send timeout "
-                                      "%ld.%06d: %d\n",
-                                      (long)tv.tv_sec, (int)tv.tv_usec, rc);
-                               return rc;
-                       }
+                       lock_sock(sk);
+                       sk->sk_sndtimeo = jiffies_left;
+                       release_sock(sk);
                }
 
                then = jiffies;
@@ -127,10 +102,9 @@ EXPORT_SYMBOL(lnet_sock_write);
 int
 lnet_sock_read(struct socket *sock, void *buffer, int nob, int timeout)
 {
-       int             rc;
-       long            jiffies_left = cfs_time_seconds(timeout);
-       unsigned long   then;
-       struct timeval  tv;
+       int rc;
+       long jiffies_left = cfs_time_seconds(timeout);
+       unsigned long then;
 
        LASSERT(nob > 0);
        LASSERT(jiffies_left > 0);
@@ -143,16 +117,12 @@ lnet_sock_read(struct socket *sock, void *buffer, int nob, int timeout)
                struct msghdr msg = {
                        .msg_flags      = 0
                };
+               struct sock *sk = sock->sk;
 
                /* Set receive timeout to remaining time */
-               jiffies_to_timeval(jiffies_left, &tv);
-               rc = kernel_setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO,
-                                      (char *)&tv, sizeof(tv));
-               if (rc != 0) {
-                       CERROR("Can't set socket recv timeout %ld.%06d: %d\n",
-                              (long)tv.tv_sec, (int)tv.tv_usec, rc);
-                       return rc;
-               }
+               lock_sock(sk);
+               sk->sk_rcvtimeo = jiffies_left;
+               release_sock(sk);
 
                then = jiffies;
                rc = kernel_recvmsg(sock, &msg, &iov, 1, nob, 0);