浏览代码

firewire: nosy: Replace timeval with timespec64

'struct timeval' uses a 32 bit field for its 'seconds' value which
will overflow in year 2038 and beyond. This patch replaces the use
of timeval in nosy.c with timespec64 which doesn't suffer from y2038
issue. The code is correct as is - since it is only using the
microseconds portion of timeval. However, this patch does the
replacement as part of a larger effort to remove all instances of
'struct timeval' from the kernel (that would help identify cases
where the code is actually broken).

Signed-off-by: Tina Ruchandani <ruchandani.tina@gmail.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Tina Ruchandani 9 年之前
父节点
当前提交
384fbb96f9
共有 1 个文件被更改,包括 5 次插入3 次删除
  1. 5 3
      drivers/firewire/nosy.c

+ 5 - 3
drivers/firewire/nosy.c

@@ -446,14 +446,16 @@ static void
 bus_reset_irq_handler(struct pcilynx *lynx)
 bus_reset_irq_handler(struct pcilynx *lynx)
 {
 {
 	struct client *client;
 	struct client *client;
-	struct timeval tv;
+	struct timespec64 ts64;
+	u32    timestamp;
 
 
-	do_gettimeofday(&tv);
+	ktime_get_real_ts64(&ts64);
+	timestamp = ts64.tv_nsec / NSEC_PER_USEC;
 
 
 	spin_lock(&lynx->client_list_lock);
 	spin_lock(&lynx->client_list_lock);
 
 
 	list_for_each_entry(client, &lynx->client_list, link)
 	list_for_each_entry(client, &lynx->client_list, link)
-		packet_buffer_put(&client->buffer, &tv.tv_usec, 4);
+		packet_buffer_put(&client->buffer, &timestamp, 4);
 
 
 	spin_unlock(&lynx->client_list_lock);
 	spin_unlock(&lynx->client_list_lock);
 }
 }