From: Deepa Dinamani <deepa.kernel@gmail.com>
To: netdev@vger.kernel.org, y2038@lists.linaro.org
Cc: arnd@arndb.de, "David S. Miller" <davem@davemloft.net>,
Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>,
James Morris <jmorris@namei.org>,
Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>,
Patrick McHardy <kaber@trash.net>
Subject: [PATCH 3/4] net: ipv4: tcp_probe: Replace timespec with timespec64
Date: Wed, 24 Feb 2016 23:07:10 -0800 [thread overview]
Message-ID: <1456384031-29244-4-git-send-email-deepa.kernel@gmail.com> (raw)
In-Reply-To: <1456384031-29244-1-git-send-email-deepa.kernel@gmail.com>
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.
This is because long is 64 bit on 64 bit systems and 32 bit on
32 bit systems. Hence, time64_t(64 bit signed number) does not
have a specifier that matches on both architectures.
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
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>
---
net/ipv4/tcp_probe.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
index ebf5ff5..f6c50af 100644
--- a/net/ipv4/tcp_probe.c
+++ b/net/ipv4/tcp_probe.c
@@ -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);
}
--
1.9.1
next prev parent reply other threads:[~2016-02-25 7:09 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-25 7:07 [PATCH 0/4] Convert network timestamps to be y2038 safe Deepa Dinamani
2016-02-25 7:07 ` [PATCH 1/4] kernel: time: Add current_nw_timestamp() for network timestamps Deepa Dinamani
2016-02-25 8:49 ` YOSHIFUJI Hideaki
2016-02-25 9:45 ` Deepa Dinamani
2016-02-26 6:49 ` YOSHIFUJI Hideaki/吉藤英明
2016-02-25 14:56 ` [Y2038] " Arnd Bergmann
2016-02-25 7:07 ` [PATCH 2/4] net: ipv4: Use y2038 safe functions and data structures Deepa Dinamani
2016-02-25 14:57 ` Arnd Bergmann
2016-02-25 7:07 ` Deepa Dinamani [this message]
2016-02-25 15:01 ` [PATCH 3/4] net: ipv4: tcp_probe: Replace timespec with timespec64 Arnd Bergmann
2016-02-27 2:56 ` Deepa Dinamani
2016-02-25 7:07 ` [PATCH 4/4] net: sctp: Convert log timestamps to be y2038 safe Deepa Dinamani
2016-02-25 14:09 ` Neil Horman
2016-02-25 14:56 ` [Y2038] " Arnd Bergmann
2016-02-26 20:19 ` [PATCH 0/4] Convert network " David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456384031-29244-4-git-send-email-deepa.kernel@gmail.com \
--to=deepa.kernel@gmail.com \
--cc=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=jmorris@namei.org \
--cc=kaber@trash.net \
--cc=kuznet@ms2.inr.ac.ru \
--cc=netdev@vger.kernel.org \
--cc=y2038@lists.linaro.org \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).