From patchwork Thu Feb 25 07:07:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepa Dinamani X-Patchwork-Id: 587940 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 802B9140557 for ; Thu, 25 Feb 2016 18:09:44 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=chCXg2PY; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759404AbcBYHJj (ORCPT ); Thu, 25 Feb 2016 02:09:39 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:35993 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758251AbcBYHJi (ORCPT ); Thu, 25 Feb 2016 02:09:38 -0500 Received: by mail-pf0-f193.google.com with SMTP id e127so2344936pfe.3 for ; Wed, 24 Feb 2016 23:09:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5PQHR+gjNPLF45Pjx139wJxaNMzYPnNngA7nLoiYpmY=; b=chCXg2PYWO2cWJK99Pgc0uqO2fY/b8+r4WN8MsLpgLsr4ZiUl8NJQWKda0c+7EJRS5 CEA35EBtzkHby3C50g2fmHdr0rLn5ad7nw6WNEF/OENaSvO1Hu2GZNYCPwc8MDqztrzm 76qD9oc8XaWwxIZNn+pMqgFMomYZWakcl1Ql/9i2nSL4fPnH0vnmf3WkZMT3njFYM5fU lshGF9DSf3ufyy3auTaYdOU3QlsFNtfTzwp9DzrRuLolMFjOPHcsT2o81Hywt/LFvSQT l/8gxgxXONFj+YDSAoCBLbhXyX0t+eDtnieEqgJN1eII7xT55iQGuAFeonzorg+T4B0R H9tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5PQHR+gjNPLF45Pjx139wJxaNMzYPnNngA7nLoiYpmY=; b=fYnW4tQrJtn8ttQHGfI1T5vWOnsQs6jCU+Zi6NqSBeXEVu8WeXiR4XU8qgrA2ZYUkd Z8bZrp6t5DXys59uLMFjOoPl4gh6t/kQr4QzDdwVrIuS8zWmEXGw0noQe19ERi8mtn9R H4skYQNPqKwMzSvH+88O/MbfAV5CeEQyrTkdBk0xICCZUq9ZdbxNwMlVW9wt9sVOHXp9 U8ISF6vjNArDaEYCREHUpor6CEWYf9t5tkyNqR+Q7O9xW4ioffZIHY/PuubPWyroasD3 d0ziP30YxzNw315c3Gqxe3KPI4ti8ZPeKrvxZpgEuXBJWz9ENs90tiGHEByoTM3NFRll PUhA== X-Gm-Message-State: AG10YOSuJbCLL2odHq2HjZjHtK7V5TvavQsXe+w57WhnxCmT8GSeHHW+ljNdiHe+RECsSw== X-Received: by 10.98.93.205 with SMTP id n74mr60640347pfj.99.1456384178309; Wed, 24 Feb 2016 23:09:38 -0800 (PST) Received: from localhost.localdomain ([106.51.31.207]) by smtp.gmail.com with ESMTPSA id 19sm9536062pfb.64.2016.02.24.23.09.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 24 Feb 2016 23:09:37 -0800 (PST) From: Deepa Dinamani To: netdev@vger.kernel.org, y2038@lists.linaro.org Cc: arnd@arndb.de, "David S. Miller" , Alexey Kuznetsov , James Morris , Hideaki YOSHIFUJI , Patrick McHardy Subject: [PATCH 3/4] net: ipv4: tcp_probe: Replace timespec with timespec64 Date: Wed, 24 Feb 2016 23:07:10 -0800 Message-Id: <1456384031-29244-4-git-send-email-deepa.kernel@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1456384031-29244-1-git-send-email-deepa.kernel@gmail.com> References: <1456384031-29244-1-git-send-email-deepa.kernel@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Cc: "David S. Miller" Cc: Alexey Kuznetsov Cc: James Morris Cc: Hideaki YOSHIFUJI Cc: Patrick McHardy Reviewed-by: Arnd Bergmann --- 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); }