Commit 311af51d authored Nov 27, 2017 by Arnd Bergmann Committed by David S. Miller Nov 30, 2017

openvswitch: use ktime_get_ts64() instead of ktime_get_ts()



timespec is deprecated because of the y2038 overflow, so let's convert
this one to ktime_get_ts64(). The code is already safe even on 32-bit
architectures, since it uses monotonic times. On 64-bit architectures,
nothing changes, while on 32-bit architectures this avoids one
type conversion.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent b2dfcb3f

net/openvswitch/flow.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -56,12 +56,12 @@

		u64 ovs_flow_used_time(unsigned long flow_jiffies)
		{
		struct timespec cur_ts;
		struct timespec64 cur_ts;
		u64 cur_ms, idle_ms;

		ktime_get_ts(&cur_ts);
		ktime_get_ts64(&cur_ts);
		idle_ms = jiffies_to_msecs(jiffies - flow_jiffies);
		cur_ms = (u64)cur_ts.tv_sec * MSEC_PER_SEC +
		cur_ms = (u64)(u32)cur_ts.tv_sec * MSEC_PER_SEC +
		cur_ts.tv_nsec / NSEC_PER_MSEC;

		return cur_ms - idle_ms;