Commit b1b270d8 authored Feb 27, 2016 by Deepa Dinamani Committed by David S. Miller Mar 01, 2016

net: ipv4: tcp_probe: Replace timespec with timespec64



TCP probe log timestamps use struct timespec which is
not y2038 safe. Even though timespec might be good enough here
as it is used to represent delta time, the plan is to get rid
of all uses of timespec in the kernel.
Replace with struct timespec64 which is y2038 safe.

Prints still use unsigned long format and type.

Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Cc: James Morris <jmorris@namei.org>
Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Cc: Patrick McHardy <kaber@trash.net>
Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 822c8685

net/ipv4/tcp_probe.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -187,13 +187,13 @@ static int tcpprobe_sprint(char *tbuf, int n)
		{
		const struct tcp_log *p
		= tcp_probe.log + tcp_probe.tail;
		struct timespec tv
		= ktime_to_timespec(ktime_sub(p->tstamp, tcp_probe.start));
		struct timespec64 ts
		= ktime_to_timespec64(ktime_sub(p->tstamp, tcp_probe.start));

		return scnprintf(tbuf, n,
		"%lu.%09lu %pISpc %pISpc %d %#x %#x %u %u %u %u %u\n",
		(unsigned long)tv.tv_sec,
		(unsigned long)tv.tv_nsec,
		(unsigned long)ts.tv_sec,
		(unsigned long)ts.tv_nsec,
		&p->src, &p->dst, p->length, p->snd_nxt, p->snd_una,
		p->snd_cwnd, p->ssthresh, p->snd_wnd, p->srtt, p->rcv_wnd);
		}

Admin message