Skip to contentSkip to conversation

qla2xxx: Remove use of 'struct timeval'

PATCH RESEND In review Tina Ruchandani 3 participants 3 messages Oct 30, 2015 – Nov 5, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 qla2xxx: Remove use of 'struct timeval'

struct register_host_info stores a 64-bit UTC system time timestamp. This patch removes the use of 'struct timeval' to obtain that timestamp as its tv_sec value will overflow on 32-bit systems in year 2038 beyond. The patch uses ktime_get_real_seconds() which returns a 64-bit seconds value.

---
 drivers/scsi/qla2xxx/qla_mr.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/scsi/qla2xxx/qla_mr.c +2 -3
index 6d190b4..d64a64a 100644
@@ -6,6 +6,7 @@
  */
 #include "qla_def.h"
 #include <linux/delay.h>
+#include <linux/ktime.h>
 #include <linux/pci.h>
 #include <linux/ratelimit.h>
 #include <linux/vmalloc.h>
@@ -1812,7 +1813,6 @@ qlafx00_fx_disc(scsi_qla_host_t *vha, fc_port_t *fcport, uint16_t fx_type)
 	struct host_system_info *phost_info;
 	struct register_host_info *preg_hsi;
 	struct new_utsname *p_sysid = NULL;
-	struct timeval tv;
 
 	sp = qla2x00_get_sp(vha, fcport, GFP_KERNEL);
 	if (!sp)
@@ -1886,8 +1886,7 @@ qlafx00_fx_disc(scsi_qla_host_t *vha, fc_port_t *fcport, uint16_t fx_type)
 			    p_sysid->domainname, DOMNAME_LENGTH);
 			strncpy(phost_info->hostdriver,
 			    QLA2XXX_VERSION, VERSION_LENGTH);
-			do_gettimeofday(&tv);
-			preg_hsi->utc = (uint64_t)tv.tv_sec;
+			preg_hsi->utc = (uint64_t)ktime_get_real_seconds();
 			ql_dbg(ql_dbg_init, vha, 0x0149,
 			    "ISP%04X: Host registration with firmware\n",
 			    ha->pdev->device);
Signature · 6 lines
2.2.0.rc0.207.ga3a616c

_______________________________________________
Y2038 mailing list
[email protected]
https://lists.linaro.org/mailman/listinfo/y2038
Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Tina Ruchandani

struct register_host_info stores a 64-bit UTC system time timestamp. This patch removes the use of 'struct timeval' to obtain that timestamp
as its tv_sec value will overflow on 32-bit systems in year 2038 beyond.
The patch uses ktime_get_real_seconds() which returns a 64-bit seconds value.

Quoted 36 lines

---
 drivers/scsi/qla2xxx/qla_mr.c | 5 ++---

 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/scsi/qla2xxx/qla_mr.c +1 -1
index 6d190b4..d64a64a 100644
@@ -6,6 +6,7 @@
   */
  #include "qla_def.h"
  #include <linux/delay.h>
+#include <linux/ktime.h>
  #include <linux/pci.h>
  #include <linux/ratelimit.h>
  #include <linux/vmalloc.h>
@@ -1812,7 +1813,6 @@ qlafx00_fx_disc(scsi_qla_host_t *vha, fc_port_t
 *fcport, uint16_t fx_type)
  	struct host_system_info *phost_info;
  	struct register_host_info *preg_hsi;
  	struct new_utsname *p_sysid = NULL;
-	struct timeval tv;


  sp = qla2x00_get_sp(vha, fcport, GFP_KERNEL); if (!sp)

drivers/scsi/qla2xxx/qla_mr.c +1 -2
@@ -1886,8 +1886,7 @@ qlafx00_fx_disc(scsi_qla_host_t *vha, fc_port_t
 *fcport, uint16_t fx_type)
  			    p_sysid->domainname, DOMNAME_LENGTH);
  			strncpy(phost_info->hostdriver,
  			    QLA2XXX_VERSION, VERSION_LENGTH);
-			do_gettimeofday(&tv);
-			preg_hsi->utc = (uint64_t)tv.tv_sec;
+			preg_hsi->utc =
 (uint64_t)ktime_get_real_seconds();
  			ql_dbg(ql_dbg_init, vha, 0x0149,
Quoted 3 lines

      "ISP%04X: Host registration with firmware\n",
      ha->pdev->device);

_______________________________________________
Y2038 mailing list
[email protected]
https://lists.linaro.org/mailman/listinfo/y2038

Reviewed-by on v1 1/1
#2 lore raw
In reply to Tina Ruchandani
Quoted 7 lines · On Friday 30 October 2015 02:15:26 Tina Ruchandani wrote:

struct register_host_info stores a 64-bit UTC system time timestamp. This patch removes the use of 'struct timeval' to obtain that timestamp as its tv_sec value will overflow on 32-bit systems in year 2038 beyond. The patch uses ktime_get_real_seconds() which returns a 64-bit seconds value.

and picked up into my y2038 tree for now.