y2038: socket: remove timespec reference in timestamping

In order to remove the 'struct timespec' definition and the
timespec64_to_timespec() helper function, change over the in-kernel
definition of 'struct scm_timestamping' to use the __kernel_old_timespec
replacement and open-code the assignment.

Acked-by: Deepa Dinamani <deepa.kernel@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/include/uapi/linux/errqueue.h b/include/uapi/linux/errqueue.h
index 28491dac074b9c9500040df4efa78218292f40c8..0cca19670fd24d5e08cf43b0b4180a0d4f563850 100644 (file)
--- a/include/uapi/linux/errqueue.h
+++ b/include/uapi/linux/errqueue.h
@@ -37,9 +37,16 @@ struct sock_extended_err {
  *     The timestamping interfaces SO_TIMESTAMPING, MSG_TSTAMP_*
  *     communicate network timestamps by passing this struct in a cmsg with
  *     recvmsg(). See Documentation/networking/timestamping.txt for details.
+ *     User space sees a timespec definition that matches either
+ *     __kernel_timespec or __kernel_old_timespec, in the kernel we
+ *     require two structure definitions to provide both.
  */
 struct scm_timestamping {
+#ifdef __KERNEL__
+       struct __kernel_old_timespec ts[3];
+#else
        struct timespec ts[3];
+#endif
 };
 
 struct scm_timestamping64 {

diff --git a/net/core/scm.c b/net/core/scm.c
index 31a38239c92f8f3d8c2710822230f073d8f43189..dc6fed1f221c4a8deec6638b88cfa425ebc6daf3 100644 (file)
--- a/net/core/scm.c
+++ b/net/core/scm.c
@@ -268,8 +268,10 @@ void put_cmsg_scm_timestamping(struct msghdr *msg, struct scm_timestamping_inter
        struct scm_timestamping tss;
        int i;
 
-       for (i = 0; i < ARRAY_SIZE(tss.ts); i++)
-               tss.ts[i] = timespec64_to_timespec(tss_internal->ts[i]);
+       for (i = 0; i < ARRAY_SIZE(tss.ts); i++) {
+               tss.ts[i].tv_sec = tss_internal->ts[i].tv_sec;
+               tss.ts[i].tv_nsec = tss_internal->ts[i].tv_nsec;
+       }
 
        put_cmsg(msg, SOL_SOCKET, SO_TIMESTAMPING_OLD, sizeof(tss), &tss);
 }