From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030618AbbJ3IvU (ORCPT ); Fri, 30 Oct 2015 04:51:20 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:35649 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751473AbbJ3IvN (ORCPT ); Fri, 30 Oct 2015 04:51:13 -0400 Date: Fri, 30 Oct 2015 01:51:01 -0700 From: Tina Ruchandani To: linux-afs@lists.infradead.org Cc: dhowells@redhat.com, arnd@arndb.de, linux-kernel@vger.kernel.org, y2038@lists.linaro.org Subject: [PATCH] AFS: Correctly use 64-bit time for UUID Message-ID: <20151030085101.GA3306@tina-laptop> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org UUID calculation uses 'struct timespec' whose seconds will overflow in year 2038 and beyond for 32-bit systems. This patch removes the dependency on 'struct timespec' by using ktime_get_real(). While the patch does not fix a 'bug' as such, it is part of a larger effort to remove instances of 'struct timespec' and other data-structures suffering from y2038 problem from the kernel. Suggested-by: Arnd Bergmann Signed-off-by: Tina Ruchandani --- Changes in v2: - Use 64-bit division API, fix 32-bit build --- fs/afs/main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fs/afs/main.c b/fs/afs/main.c index 35de0c0..129ff43 100644 --- a/fs/afs/main.c +++ b/fs/afs/main.c @@ -14,6 +14,7 @@ #include #include #include +#include #include "internal.h" MODULE_DESCRIPTION("AFS Client File System"); @@ -37,7 +38,6 @@ struct workqueue_struct *afs_wq; */ static int __init afs_get_client_UUID(void) { - struct timespec ts; u64 uuidtime; u16 clockseq; int ret; @@ -48,9 +48,7 @@ static int __init afs_get_client_UUID(void) if (ret < 0) return ret; - getnstimeofday(&ts); - uuidtime = (u64) ts.tv_sec * 1000 * 1000 * 10; - uuidtime += ts.tv_nsec / 100; + uuidtime = ktime_divns(ktime_get_real(), 100); uuidtime += AFS_UUID_TO_UNIX_TIME; afs_uuid.time_low = uuidtime; afs_uuid.time_mid = uuidtime >> 32; -- 1.9.1