[PATCH] openvswitch: use ktime_get_ts64() instead of ktime_get_ts()

From: Arnd Bergmann <arnd@arndb.de>
To: Pravin Shelar <pshelar@nicira.com>,
	"David S. Miller" <davem@davemloft.net>
Cc: dev@openvswitch.org, Willem de Bruijn <willemb@google.com>,
	Arnd Bergmann <arnd@arndb.de>,
	y2038@lists.linaro.org, netdev@vger.kernel.org,
	Yi-Hung Wei <yihung.wei@gmail.com>, Jiri Benc <jbenc@redhat.com>,
	Pravin B Shelar <pshelar@ovn.org>, Yi Yang <yi.y.yang@intel.com>,
	Tonghao Zhang <xiangxia.m.yue@gmail.com>,
	Jarno Rajahalme <jarno@ovn.org>,
	linux-kernel@vger.kernel.org
Subject: [PATCH] openvswitch: use ktime_get_ts64() instead of ktime_get_ts()
Date: Mon, 27 Nov 2017 12:41:38 +0100	[thread overview]
Message-ID: <20171127114159.2528123-1-arnd@arndb.de> (raw)

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>
---
 net/openvswitch/flow.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c
index dbe2379329c5..76d050aba7a4 100644
--- a/net/openvswitch/flow.c
+++ b/net/openvswitch/flow.c
@@ -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;
-- 
2.9.0

_______________________________________________
Y2038 mailing list
Y2038@lists.linaro.org
https://lists.linaro.org/mailman/listinfo/y2038
