From mboxrd@z Thu Jan 1 00:00:00 1970 From: Deepa Dinamani Subject: [PATCH v4 24/26] fnic: Use time64_t to represent trace timestamps Date: Sat, 13 Aug 2016 15:48:36 -0700 Message-ID: <1471128518-24075-25-git-send-email-deepa.kernel@gmail.com> References: <1471128518-24075-1-git-send-email-deepa.kernel@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1471128518-24075-1-git-send-email-deepa.kernel@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: y2038-bounces@lists.linaro.org Sender: "Y2038" To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Suma Ramars , tytso@mit.edu, "Martin K. Petersen" , arnd@arndb.de, y2038@lists.linaro.org, Hiral Patel , viro@zeniv.linux.org.uk, linux-scsi@vger.kernel.org, "James E.J. Bottomley" , tglx@linutronix.de, Brian Uchino , torvalds@linux-foundation.org List-Id: linux-scsi@vger.kernel.org dHJhY2UgdGltZXN0YW1wcyB1c2Ugc3RydWN0IHRpbWVzcGVjIGFuZCBDVVJSRU5UX1RJTUUgd2hp Y2gKYXJlIG5vdCB5MjAzOCBzYWZlLgpUaGVzZSB0aW1lc3RhbXBzIGFyZSBvbmx5IHBhcnQgb2Yg dGhlIHRyYWNlIGxvZyBvbiB0aGUgbWFjaGluZQphbmQgYXJlIG5vdCBzaGFyZWQgd2l0aCB0aGUg Zm5pYy4KUmVwbGFjZSB0aGVuIHdpdGggeTIwMzggc2FmZSBzdHJ1Y3QgdGltZXNwZWM2NCBhbmQK a3RpbWVfZ2V0X3JlYWxfdHM2NCgpLCByZXNwZWN0aXZlbHkuCgpTaWduZWQtb2ZmLWJ5OiBEZWVw YSBEaW5hbWFuaSA8ZGVlcGEua2VybmVsQGdtYWlsLmNvbT4KUmV2aWV3ZWQtYnk6IEFybmQgQmVy Z21hbm4gPGFybmRAYXJuZGIuZGU+CkNjOiBIaXJhbCBQYXRlbCA8aGlyYWxwYXRAY2lzY28uY29t PgpDYzogU3VtYSBSYW1hcnMgPHNyYW1hcnNAY2lzY28uY29tPgpDYzogQnJpYW4gVWNoaW5vIDxi dWNoaW5vQGNpc2NvLmNvbT4KQ2M6ICJKYW1lcyBFLkouIEJvdHRvbWxleSIgPGplamJAbGludXgu dm5ldC5pYm0uY29tPgpDYzogIk1hcnRpbiBLLiBQZXRlcnNlbiIgPG1hcnRpbi5wZXRlcnNlbkBv cmFjbGUuY29tPgpDYzogbGludXgtc2NzaUB2Z2VyLmtlcm5lbC5vcmcKLS0tCiBkcml2ZXJzL3Nj c2kvZm5pYy9mbmljX3RyYWNlLmMgfCA0ICsrLS0KIGRyaXZlcnMvc2NzaS9mbmljL2ZuaWNfdHJh Y2UuaCB8IDIgKy0KIDIgZmlsZXMgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvc2NzaS9mbmljL2ZuaWNfdHJhY2UuYyBiL2RyaXZl cnMvc2NzaS9mbmljL2ZuaWNfdHJhY2UuYwppbmRleCA0ZTE1YzRiLi41YTVmYTAxIDEwMDY0NAot LS0gYS9kcml2ZXJzL3Njc2kvZm5pYy9mbmljX3RyYWNlLmMKKysrIGIvZHJpdmVycy9zY3NpL2Zu aWMvZm5pY190cmFjZS5jCkBAIC02MTMsNyArNjEzLDcgQEAgaW50IGZuaWNfZmNfdHJhY2Vfc2V0 X2RhdGEodTMyIGhvc3Rfbm8sIHU4IGZyYW1lX3R5cGUsCiAJCQlmY190cmFjZV9lbnRyaWVzLnJk X2lkeCA9IDA7CiAJfQogCi0JZmNfYnVmLT50aW1lX3N0YW1wID0gQ1VSUkVOVF9USU1FOworCWt0 aW1lX2dldF9yZWFsX3RzNjQoJmZjX2J1Zi0+dGltZV9zdGFtcCk7CiAJZmNfYnVmLT5ob3N0X25v ID0gaG9zdF9ubzsKIAlmY19idWYtPmZyYW1lX3R5cGUgPSBmcmFtZV90eXBlOwogCkBAIC03NDAs NyArNzQwLDcgQEAgdm9pZCBjb3B5X2FuZF9mb3JtYXRfdHJhY2VfZGF0YShzdHJ1Y3QgZmNfdHJh Y2VfaGRyICp0ZGF0YSwKIAogCWxlbiA9ICpvcmlnX2xlbjsKIAotCXRpbWVfdG9fdG0odGRhdGEt PnRpbWVfc3RhbXAudHZfc2VjLCAwLCAmdG0pOworCXRpbWU2NF90b190bSh0ZGF0YS0+dGltZV9z dGFtcC50dl9zZWMsIDAsICZ0bSk7CiAKIAlmbXQgPSAiJTAyZDolMDJkOiUwNGxkICUwMmQ6JTAy ZDolMDJkLiUwOWx1IG5zJTh4ICAgICAgICVjJTh4XHQiOwogCWxlbiArPSBzbnByaW50Zihmbmlj X2RiZ2ZzX3BydC0+YnVmZmVyICsgbGVuLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9zY3NpL2ZuaWMv Zm5pY190cmFjZS5oIGIvZHJpdmVycy9zY3NpL2ZuaWMvZm5pY190cmFjZS5oCmluZGV4IGE4YWEw NTcuLmUzNzVkMGMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvc2NzaS9mbmljL2ZuaWNfdHJhY2UuaAor KysgYi9kcml2ZXJzL3Njc2kvZm5pYy9mbmljX3RyYWNlLmgKQEAgLTcyLDcgKzcyLDcgQEAgc3Ry dWN0IGZuaWNfdHJhY2VfZGF0YSB7CiB0eXBlZGVmIHN0cnVjdCBmbmljX3RyYWNlX2RhdGEgZm5p Y190cmFjZV9kYXRhX3Q7CiAKIHN0cnVjdCBmY190cmFjZV9oZHIgewotCXN0cnVjdCB0aW1lc3Bl YyB0aW1lX3N0YW1wOworCXN0cnVjdCB0aW1lc3BlYzY0IHRpbWVfc3RhbXA7CiAJdTMyIGhvc3Rf bm87CiAJdTggZnJhbWVfdHlwZTsKIAl1OCBmcmFtZV9sZW47Ci0tIAoxLjkuMQoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWTIwMzggbWFpbGluZyBsaXN0 ClkyMDM4QGxpc3RzLmxpbmFyby5vcmcKaHR0cHM6Ly9saXN0cy5saW5hcm8ub3JnL21haWxtYW4v bGlzdGluZm8veTIwMzgK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f65.google.com ([209.85.220.65]:34688 "EHLO mail-pa0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753125AbcHNKWC (ORCPT ); Sun, 14 Aug 2016 06:22:02 -0400 From: Deepa Dinamani To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, tglx@linutronix.de, torvalds@linux-foundation.org, tytso@mit.edu, viro@zeniv.linux.org.uk, y2038@lists.linaro.org, Hiral Patel , Suma Ramars , Brian Uchino , "James E.J. Bottomley" , "Martin K. Petersen" , linux-scsi@vger.kernel.org Subject: [PATCH v4 24/26] fnic: Use time64_t to represent trace timestamps Date: Sat, 13 Aug 2016 15:48:36 -0700 Message-Id: <1471128518-24075-25-git-send-email-deepa.kernel@gmail.com> In-Reply-To: <1471128518-24075-1-git-send-email-deepa.kernel@gmail.com> References: <1471128518-24075-1-git-send-email-deepa.kernel@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: trace timestamps use struct timespec and CURRENT_TIME which are not y2038 safe. These timestamps are only part of the trace log on the machine and are not shared with the fnic. Replace then with y2038 safe struct timespec64 and ktime_get_real_ts64(), respectively. Signed-off-by: Deepa Dinamani Reviewed-by: Arnd Bergmann Cc: Hiral Patel Cc: Suma Ramars Cc: Brian Uchino Cc: "James E.J. Bottomley" Cc: "Martin K. Petersen" Cc: linux-scsi@vger.kernel.org --- drivers/scsi/fnic/fnic_trace.c | 4 ++-- drivers/scsi/fnic/fnic_trace.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/fnic/fnic_trace.c b/drivers/scsi/fnic/fnic_trace.c index 4e15c4b..5a5fa01 100644 --- a/drivers/scsi/fnic/fnic_trace.c +++ b/drivers/scsi/fnic/fnic_trace.c @@ -613,7 +613,7 @@ int fnic_fc_trace_set_data(u32 host_no, u8 frame_type, fc_trace_entries.rd_idx = 0; } - fc_buf->time_stamp = CURRENT_TIME; + ktime_get_real_ts64(&fc_buf->time_stamp); fc_buf->host_no = host_no; fc_buf->frame_type = frame_type; @@ -740,7 +740,7 @@ void copy_and_format_trace_data(struct fc_trace_hdr *tdata, len = *orig_len; - time_to_tm(tdata->time_stamp.tv_sec, 0, &tm); + time64_to_tm(tdata->time_stamp.tv_sec, 0, &tm); fmt = "%02d:%02d:%04ld %02d:%02d:%02d.%09lu ns%8x %c%8x\t"; len += snprintf(fnic_dbgfs_prt->buffer + len, diff --git a/drivers/scsi/fnic/fnic_trace.h b/drivers/scsi/fnic/fnic_trace.h index a8aa057..e375d0c 100644 --- a/drivers/scsi/fnic/fnic_trace.h +++ b/drivers/scsi/fnic/fnic_trace.h @@ -72,7 +72,7 @@ struct fnic_trace_data { typedef struct fnic_trace_data fnic_trace_data_t; struct fc_trace_hdr { - struct timespec time_stamp; + struct timespec64 time_stamp; u32 host_no; u8 frame_type; u8 frame_len; -- 1.9.1