From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752166AbcFTB2e (ORCPT ); Sun, 19 Jun 2016 21:28:34 -0400 Received: from mail-pa0-f68.google.com ([209.85.220.68]:35670 "EHLO mail-pa0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751705AbcFTB2W (ORCPT ); Sun, 19 Jun 2016 21:28:22 -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" , John Stultz , linux-scsi@vger.kernel.org Subject: [PATCH v2 19/24] fnic: Use time64_t to represent trace timestamps Date: Sun, 19 Jun 2016 17:27:18 -0700 Message-Id: <1466382443-11063-20-git-send-email-deepa.kernel@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1466382443-11063-1-git-send-email-deepa.kernel@gmail.com> References: <1466382443-11063-1-git-send-email-deepa.kernel@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Note that change to add time64_to_tm() is already part of John's kernel tree: https://lkml.org/lkml/2016/6/17/875 . Signed-off-by: Deepa Dinamani Cc: Hiral Patel Cc: Suma Ramars Cc: Brian Uchino Cc: "James E.J. Bottomley" Cc: "Martin K. Petersen" Cc: John Stultz 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Deepa Dinamani Subject: [PATCH v2 19/24] fnic: Use time64_t to represent trace timestamps Date: Sun, 19 Jun 2016 17:27:18 -0700 Message-ID: <1466382443-11063-20-git-send-email-deepa.kernel@gmail.com> References: <1466382443-11063-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: <1466382443-11063-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 , John Stultz , 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 a3RpbWVfZ2V0X3JlYWxfdHM2NCgpLCByZXNwZWN0aXZlbHkuCgpOb3RlIHRoYXQgY2hhbmdlIHRv IGFkZCB0aW1lNjRfdG9fdG0oKSBpcyBhbHJlYWR5IHBhcnQgb2YgSm9obidzCmtlcm5lbCB0cmVl OiBodHRwczovL2xrbWwub3JnL2xrbWwvMjAxNi82LzE3Lzg3NSAuCgpTaWduZWQtb2ZmLWJ5OiBE ZWVwYSBEaW5hbWFuaSA8ZGVlcGEua2VybmVsQGdtYWlsLmNvbT4KQ2M6IEhpcmFsIFBhdGVsIDxo aXJhbHBhdEBjaXNjby5jb20+CkNjOiBTdW1hIFJhbWFycyA8c3JhbWFyc0BjaXNjby5jb20+CkNj OiBCcmlhbiBVY2hpbm8gPGJ1Y2hpbm9AY2lzY28uY29tPgpDYzogIkphbWVzIEUuSi4gQm90dG9t bGV5IiA8amVqYkBsaW51eC52bmV0LmlibS5jb20+CkNjOiAiTWFydGluIEsuIFBldGVyc2VuIiA8 bWFydGluLnBldGVyc2VuQG9yYWNsZS5jb20+CkNjOiBKb2huIFN0dWx0eiA8am9obi5zdHVsdHpA bGluYXJvLm9yZz4KQ2M6IGxpbnV4LXNjc2lAdmdlci5rZXJuZWwub3JnCi0tLQogZHJpdmVycy9z Y3NpL2ZuaWMvZm5pY190cmFjZS5jIHwgNCArKy0tCiBkcml2ZXJzL3Njc2kvZm5pYy9mbmljX3Ry YWNlLmggfCAyICstCiAyIGZpbGVzIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3Njc2kvZm5pYy9mbmljX3RyYWNlLmMgYi9kcml2 ZXJzL3Njc2kvZm5pYy9mbmljX3RyYWNlLmMKaW5kZXggNGUxNWM0Yi4uNWE1ZmEwMSAxMDA2NDQK LS0tIGEvZHJpdmVycy9zY3NpL2ZuaWMvZm5pY190cmFjZS5jCisrKyBiL2RyaXZlcnMvc2NzaS9m bmljL2ZuaWNfdHJhY2UuYwpAQCAtNjEzLDcgKzYxMyw3IEBAIGludCBmbmljX2ZjX3RyYWNlX3Nl dF9kYXRhKHUzMiBob3N0X25vLCB1OCBmcmFtZV90eXBlLAogCQkJZmNfdHJhY2VfZW50cmllcy5y ZF9pZHggPSAwOwogCX0KIAotCWZjX2J1Zi0+dGltZV9zdGFtcCA9IENVUlJFTlRfVElNRTsKKwlr dGltZV9nZXRfcmVhbF90czY0KCZmY19idWYtPnRpbWVfc3RhbXApOwogCWZjX2J1Zi0+aG9zdF9u byA9IGhvc3Rfbm87CiAJZmNfYnVmLT5mcmFtZV90eXBlID0gZnJhbWVfdHlwZTsKIApAQCAtNzQw LDcgKzc0MCw3IEBAIHZvaWQgY29weV9hbmRfZm9ybWF0X3RyYWNlX2RhdGEoc3RydWN0IGZjX3Ry YWNlX2hkciAqdGRhdGEsCiAKIAlsZW4gPSAqb3JpZ19sZW47CiAKLQl0aW1lX3RvX3RtKHRkYXRh LT50aW1lX3N0YW1wLnR2X3NlYywgMCwgJnRtKTsKKwl0aW1lNjRfdG9fdG0odGRhdGEtPnRpbWVf c3RhbXAudHZfc2VjLCAwLCAmdG0pOwogCiAJZm10ID0gIiUwMmQ6JTAyZDolMDRsZCAlMDJkOiUw MmQ6JTAyZC4lMDlsdSBucyU4eCAgICAgICAlYyU4eFx0IjsKIAlsZW4gKz0gc25wcmludGYoZm5p Y19kYmdmc19wcnQtPmJ1ZmZlciArIGxlbiwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvc2NzaS9mbmlj L2ZuaWNfdHJhY2UuaCBiL2RyaXZlcnMvc2NzaS9mbmljL2ZuaWNfdHJhY2UuaAppbmRleCBhOGFh MDU3Li5lMzc1ZDBjIDEwMDY0NAotLS0gYS9kcml2ZXJzL3Njc2kvZm5pYy9mbmljX3RyYWNlLmgK KysrIGIvZHJpdmVycy9zY3NpL2ZuaWMvZm5pY190cmFjZS5oCkBAIC03Miw3ICs3Miw3IEBAIHN0 cnVjdCBmbmljX3RyYWNlX2RhdGEgewogdHlwZWRlZiBzdHJ1Y3QgZm5pY190cmFjZV9kYXRhIGZu aWNfdHJhY2VfZGF0YV90OwogCiBzdHJ1Y3QgZmNfdHJhY2VfaGRyIHsKLQlzdHJ1Y3QgdGltZXNw ZWMgdGltZV9zdGFtcDsKKwlzdHJ1Y3QgdGltZXNwZWM2NCB0aW1lX3N0YW1wOwogCXUzMiBob3N0 X25vOwogCXU4IGZyYW1lX3R5cGU7CiAJdTggZnJhbWVfbGVuOwotLSAKMS45LjEKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClkyMDM4IG1haWxpbmcgbGlz dApZMjAzOEBsaXN0cy5saW5hcm8ub3JnCmh0dHBzOi8vbGlzdHMubGluYXJvLm9yZy9tYWlsbWFu L2xpc3RpbmZvL3kyMDM4Cg==