diff mbox

[RESEND] qla2xxx: Remove use of 'struct timeval'

Message ID 20151030091526.GA4028@tina-laptop (mailing list archive)
State New, archived
Headers show

Commit Message

Tina Ruchandani Oct. 30, 2015, 9:15 a.m. UTC
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.

Signed-off-by: Tina Ruchandani <ruchandani.tina@gmail.com>
---
 drivers/scsi/qla2xxx/qla_mr.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Johannes Thumshirn Oct. 30, 2015, 9:36 a.m. UTC | #1
On Fri, 2015-10-30 at 02:15 -0700, 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.
> 
> Signed-off-by: Tina Ruchandani <ruchandani.tina@gmail.com>

Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>

> ---
>  drivers/scsi/qla2xxx/qla_mr.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/scsi/qla2xxx/qla_mr.c
> b/drivers/scsi/qla2xxx/qla_mr.c
> index 6d190b4..d64a64a 100644
> --- a/drivers/scsi/qla2xxx/qla_mr.c
> +++ b/drivers/scsi/qla2xxx/qla_mr.c
> @@ -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);

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Arnd Bergmann Nov. 5, 2015, 4:33 p.m. UTC | #2
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.
> 
> Signed-off-by: Tina Ruchandani <ruchandani.tina@gmail.com>
> 

Reviewed-by: Arnd Bergmann <arnd@arndb.de>

and picked up into my y2038 tree for now.
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/scsi/qla2xxx/qla_mr.c b/drivers/scsi/qla2xxx/qla_mr.c
index 6d190b4..d64a64a 100644
--- a/drivers/scsi/qla2xxx/qla_mr.c
+++ b/drivers/scsi/qla2xxx/qla_mr.c
@@ -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);