On October 30, 2015 6:05:15 PM GMT+09:00, Tina Ruchandani
<[email protected]> wrote:
>'struct timeval' will have its tv_sec value overflow on 32-bit systems
>in year 2038 and beyond. This patch replaces the use of struct timeval
>for computing mpi_request.TimeStamp, and instead uses ktime_t which
>provides
>64-bit seconds value. The timestamp computed remains unaffected
>(milliseconds
>since Unix epoch).
>
>Signed-off-by: Tina Ruchandani <[email protected]>
Can you wait a cycle on this? Martin Petersen is on a mission to wrangle the
mpt2/3sas merger in this window, which will conflict with this.
James
> drivers/scsi/mpt2sas/mpt2sas_base.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c
>b/drivers/scsi/mpt2sas/mpt2sas_base.c
>index 58e4521..6d80477 100644
>--- a/drivers/scsi/mpt2sas/mpt2sas_base.c
>+++ b/drivers/scsi/mpt2sas/mpt2sas_base.c
>@@ -57,6 +57,7 @@
> #include <linux/sort.h>
> #include <linux/io.h>
> #include <linux/time.h>
>+#include <linux/ktime.h>
> #include <linux/kthread.h>
> #include <linux/aer.h>
>
>@@ -3616,7 +3617,7 @@ _base_send_ioc_init(struct MPT2SAS_ADAPTER *ioc,
>int sleep_flag)
> Mpi2IOCInitRequest_t mpi_request;
> Mpi2IOCInitReply_t mpi_reply;
> int i, r = 0;
>- struct timeval current_time;
>+ ktime_t current_time;
> u16 ioc_status;
> u32 reply_post_free_array_sz = 0;
> Mpi2IOCInitRDPQArrayEntry *reply_post_free_array = NULL;
>@@ -3678,9 +3679,8 @@ _base_send_ioc_init(struct MPT2SAS_ADAPTER *ioc,
>int sleep_flag)
> /* This time stamp specifies number of milliseconds
> * since epoch ~ midnight January 1, 1970.
> */
>- do_gettimeofday(¤t_time);
>- mpi_request.TimeStamp = cpu_to_le64((u64)current_time.tv_sec * 1000 +
>- (current_time.tv_usec / 1000));
>+ current_time = ktime_get_real();
>+ mpi_request.TimeStamp = cpu_to_le64(ktime_to_ms(current_time));
>
> if (ioc->logging_level & MPT_DEBUG_INIT) {
> __le32 *mfp;
--
Sent from my Android device with K-9 Mail. Please excuse my brevity.
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
