diff options
author | Tina Ruchandani <ruchandani.tina@gmail.com> | 2015-10-30 01:24:56 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-11-01 17:01:16 -0500 |
commit | 1032a6687168af9509615879d513f77e4049062e (patch) | |
tree | a3350d57a512f7c167b9986b90162068aa175f39 /net/dccp | |
parent | 1cf7d8dda2bd1704ca8552c93d5475af444a986b (diff) | |
download | linux-stable-1032a6687168af9509615879d513f77e4049062e.tar.gz linux-stable-1032a6687168af9509615879d513f77e4049062e.tar.bz2 linux-stable-1032a6687168af9509615879d513f77e4049062e.zip |
Use 64-bit timekeeping
This patch changes the use of struct timespec in
dccp_probe to use struct timespec64 instead. timespec uses a 32-bit
seconds field which will overflow in the year 2038 and beyond. timespec64
uses a 64-bit seconds field. Note that the correctness of the code isn't
changed, since the original code only uses the timestamps to compute a
small elapsed interval. This patch is part of a larger attempt to remove
instances of 32-bit timekeeping structures (timespec, timeval, time_t)
from the kernel so it is easier to identify where the real 2038 issues
are.
Signed-off-by: Tina Ruchandani <ruchandani.tina@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp')
-rw-r--r-- | net/dccp/probe.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/net/dccp/probe.c b/net/dccp/probe.c index d8346d0eadeb..3d3fda05b32d 100644 --- a/net/dccp/probe.c +++ b/net/dccp/probe.c @@ -30,6 +30,7 @@ #include <linux/module.h> #include <linux/kfifo.h> #include <linux/vmalloc.h> +#include <linux/time64.h> #include <linux/gfp.h> #include <net/net_namespace.h> @@ -47,20 +48,20 @@ static struct { struct kfifo fifo; spinlock_t lock; wait_queue_head_t wait; - struct timespec tstart; + struct timespec64 tstart; } dccpw; static void printl(const char *fmt, ...) { va_list args; int len; - struct timespec now; + struct timespec64 now; char tbuf[256]; va_start(args, fmt); - getnstimeofday(&now); + getnstimeofday64(&now); - now = timespec_sub(now, dccpw.tstart); + now = timespec64_sub(now, dccpw.tstart); len = sprintf(tbuf, "%lu.%06lu ", (unsigned long) now.tv_sec, @@ -110,7 +111,7 @@ static struct jprobe dccp_send_probe = { static int dccpprobe_open(struct inode *inode, struct file *file) { kfifo_reset(&dccpw.fifo); - getnstimeofday(&dccpw.tstart); + getnstimeofday64(&dccpw.tstart); return 0; } |