Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1315035 > unrolled thread

[PATCH RESEND] AFS: Correctly use 64-bit time for UUID

Back to article view | Back to linux.kernel

Contents

  [PATCH RESEND] AFS: Correctly use 64-bit time for UUID Arnd Bergmann <arnd@arndb.de> - 2016-01-22 15:40 +0100
    Re: [Y2038] [PATCH RESEND] AFS: Correctly use 64-bit time for UUID Arnd Bergmann <arnd@arndb.de> - 2016-01-22 16:20 +0100

#1315035 — [PATCH RESEND] AFS: Correctly use 64-bit time for UUID

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 <arnd@arndb.de>
Signed-off-by: Tina Ruchandani <ruchandani.tina@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/fs/afs/main.c b/fs/afs/main.c
index 35de0c04729f..129ff432391c 100644
--- a/fs/afs/main.c
+++ b/fs/afs/main.c
@@ -14,6 +14,7 @@
 #include <linux/init.h>
 #include <linux/completion.h>
 #include <linux/sched.h>
+#include <linux/ktime.h>
 #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;

[toc] | [next] | [standalone]

#1315064 — Re: [Y2038] [PATCH RESEND] AFS: Correctly use 64-bit time for UUID

On Friday 22 January 2016 15:32:01 Arnd Bergmann wrote:
> 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 <arnd@arndb.de>
> Signed-off-by: Tina Ruchandani <ruchandani.tina@gmail.com>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> 


I was missing

From: Tina Ruchandani <ruchandani.tina@gmail.com>

If anyone is going to pick this up, let me know whether you will fix
it up yourself or if I should resend

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web