From mboxrd@z Thu Jan 1 00:00:00 1970 From: Deepa Dinamani Subject: [PATCH RESEND] fs: f2fs: Use ktime_get_real_seconds for sit_info times Date: Sat, 21 Jan 2017 15:04:09 -0800 Message-ID: <1485039849-17088-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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: y2038-bounces@lists.linaro.org Sender: "Y2038" To: jaegeuk@kernel.org, cm224.lee@samsung.com, linux-f2fs-devel@lists.sourceforge.net Cc: y2038@lists.linaro.org, linux-kernel@vger.kernel.org, arnd@arndb.de List-Id: linux-f2fs-devel.lists.sourceforge.net Q1VSUkVOVF9USU1FX1NFQyBpcyBub3QgeTIwMzggc2FmZS4KClJlcGxhY2UgdXNlIG9mIENVUlJF TlRfVElNRV9TRUMgd2l0aCBrdGltZV9nZXRfcmVhbF9zZWNvbmRzCmluIHNlZ21lbnQgdGltZXN0 YW1wcyB1c2VkIGJ5IEdDIGFsZ29yaXRobSBpbmNsdWRpbmcgdGhlCnNlZ21lbnQgbXRpbWUgdGlt ZXN0YW1wcy4KClNpZ25lZC1vZmYtYnk6IERlZXBhIERpbmFtYW5pIDxkZWVwYS5rZXJuZWxAZ21h aWwuY29tPgotLS0KIGZzL2YyZnMvc2VnbWVudC5jIHwgMiArLQogZnMvZjJmcy9zZWdtZW50Lmgg fCA1ICsrKy0tCiAyIGZpbGVzIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9mcy9mMmZzL3NlZ21lbnQuYyBiL2ZzL2YyZnMvc2VnbWVudC5jCmlu ZGV4IGZiNTdhYjkuLjQ4ZWZkODggMTAwNjQ0Ci0tLSBhL2ZzL2YyZnMvc2VnbWVudC5jCisrKyBi L2ZzL2YyZnMvc2VnbWVudC5jCkBAIC0yNDIzLDcgKzI0MjMsNyBAQCBzdGF0aWMgaW50IGJ1aWxk X3NpdF9pbmZvKHN0cnVjdCBmMmZzX3NiX2luZm8gKnNiaSkKIAlzaXRfaS0+ZGlydHlfc2VudHJp ZXMgPSAwOwogCXNpdF9pLT5zZW50c19wZXJfYmxvY2sgPSBTSVRfRU5UUllfUEVSX0JMT0NLOwog CXNpdF9pLT5lbGFwc2VkX3RpbWUgPSBsZTY0X3RvX2NwdShzYmktPmNrcHQtPmVsYXBzZWRfdGlt ZSk7Ci0Jc2l0X2ktPm1vdW50ZWRfdGltZSA9IENVUlJFTlRfVElNRV9TRUMudHZfc2VjOworCXNp dF9pLT5tb3VudGVkX3RpbWUgPSBrdGltZV9nZXRfcmVhbF9zZWNvbmRzKCk7CiAJbXV0ZXhfaW5p dCgmc2l0X2ktPnNlbnRyeV9sb2NrKTsKIAlyZXR1cm4gMDsKIH0KZGlmZiAtLWdpdCBhL2ZzL2Yy ZnMvc2VnbWVudC5oIGIvZnMvZjJmcy9zZWdtZW50LmgKaW5kZXggNWNiNTc1NS4uY2Q0MGMzNCAx MDA2NDQKLS0tIGEvZnMvZjJmcy9zZWdtZW50LmgKKysrIGIvZnMvZjJmcy9zZWdtZW50LmgKQEAg LTY5MSw4ICs2OTEsOSBAQCBzdGF0aWMgaW5saW5lIHZvaWQgc2V0X3RvX25leHRfc2l0KHN0cnVj dCBzaXRfaW5mbyAqc2l0X2ksIHVuc2lnbmVkIGludCBzdGFydCkKIHN0YXRpYyBpbmxpbmUgdW5z aWduZWQgbG9uZyBsb25nIGdldF9tdGltZShzdHJ1Y3QgZjJmc19zYl9pbmZvICpzYmkpCiB7CiAJ c3RydWN0IHNpdF9pbmZvICpzaXRfaSA9IFNJVF9JKHNiaSk7Ci0JcmV0dXJuIHNpdF9pLT5lbGFw c2VkX3RpbWUgKyBDVVJSRU5UX1RJTUVfU0VDLnR2X3NlYyAtCi0JCQkJCQlzaXRfaS0+bW91bnRl ZF90aW1lOworCXRpbWU2NF90IG5vdyA9IGt0aW1lX2dldF9yZWFsX3NlY29uZHMoKTsKKworCXJl dHVybiBzaXRfaS0+ZWxhcHNlZF90aW1lICsgbm93IC0gc2l0X2ktPm1vdW50ZWRfdGltZTsKIH0K IAogc3RhdGljIGlubGluZSB2b2lkIHNldF9zdW1tYXJ5KHN0cnVjdCBmMmZzX3N1bW1hcnkgKnN1 bSwgbmlkX3QgbmlkLAotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fClkyMDM4IG1haWxpbmcgbGlzdApZMjAzOEBsaXN0cy5saW5hcm8ub3Jn Cmh0dHBzOi8vbGlzdHMubGluYXJvLm9yZy9tYWlsbWFuL2xpc3RpbmZvL3kyMDM4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751446AbdAUXHx (ORCPT ); Sat, 21 Jan 2017 18:07:53 -0500 Received: from mail-pf0-f196.google.com ([209.85.192.196]:33646 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750889AbdAUXHx (ORCPT ); Sat, 21 Jan 2017 18:07:53 -0500 From: Deepa Dinamani To: jaegeuk@kernel.org, cm224.lee@samsung.com, linux-f2fs-devel@lists.sourceforge.net Cc: linux-kernel@vger.kernel.org, arnd@arndb.de, y2038@lists.linaro.org Subject: [PATCH RESEND] fs: f2fs: Use ktime_get_real_seconds for sit_info times Date: Sat, 21 Jan 2017 15:04:09 -0800 Message-Id: <1485039849-17088-1-git-send-email-deepa.kernel@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org CURRENT_TIME_SEC is not y2038 safe. Replace use of CURRENT_TIME_SEC with ktime_get_real_seconds in segment timestamps used by GC algorithm including the segment mtime timestamps. Signed-off-by: Deepa Dinamani --- fs/f2fs/segment.c | 2 +- fs/f2fs/segment.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index fb57ab9..48efd88 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -2423,7 +2423,7 @@ static int build_sit_info(struct f2fs_sb_info *sbi) sit_i->dirty_sentries = 0; sit_i->sents_per_block = SIT_ENTRY_PER_BLOCK; sit_i->elapsed_time = le64_to_cpu(sbi->ckpt->elapsed_time); - sit_i->mounted_time = CURRENT_TIME_SEC.tv_sec; + sit_i->mounted_time = ktime_get_real_seconds(); mutex_init(&sit_i->sentry_lock); return 0; } diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h index 5cb5755..cd40c34 100644 --- a/fs/f2fs/segment.h +++ b/fs/f2fs/segment.h @@ -691,8 +691,9 @@ static inline void set_to_next_sit(struct sit_info *sit_i, unsigned int start) static inline unsigned long long get_mtime(struct f2fs_sb_info *sbi) { struct sit_info *sit_i = SIT_I(sbi); - return sit_i->elapsed_time + CURRENT_TIME_SEC.tv_sec - - sit_i->mounted_time; + time64_t now = ktime_get_real_seconds(); + + return sit_i->elapsed_time + now - sit_i->mounted_time; } static inline void set_summary(struct f2fs_summary *sum, nid_t nid, -- 2.7.4