p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Arnd Bergmann 2017-11-27 12:41:38 +01:00 committed by David S. Miller
parent b2dfcb3f83
commit 311af51dcb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/openvswitch/flow.c
View File

@ -56,12 +56,12 @@
u64 ovs_flow_used_time(unsigned long flow_jiffies) u64 ovs_flow_used_time(unsigned long flow_jiffies)
{ {
struct timespec cur_ts; struct timespec64 cur_ts;
u64 cur_ms, idle_ms; u64 cur_ms, idle_ms;
ktime_get_ts(&cur_ts); ktime_get_ts64(&cur_ts);
idle_ms = jiffies_to_msecs(jiffies - flow_jiffies); 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; cur_ts.tv_nsec / NSEC_PER_MSEC;
return cur_ms - idle_ms; return cur_ms - idle_ms;