From mboxrd@z Thu Jan 1 00:00:00 1970 From: Deepa Dinamani Subject: [PATCH 10/21] fs: f2fs: Use ktime_get_real_seconds for sit_info times Date: Wed, 8 Jun 2016 22:04:54 -0700 Message-ID: <1465448705-25055-11-git-send-email-deepa.kernel@gmail.com> References: <1465448705-25055-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: <1465448705-25055-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: Changman Lee , Chao Yu , Arnd Bergmann , y2038@lists.linaro.org, linux-f2fs-devel@lists.sourceforge.net, Al Viro , Jaegeuk Kim , Thomas Gleixner , Linus Torvalds List-Id: linux-f2fs-devel.lists.sourceforge.net Q1VSUkVOVF9USU1FX1NFQyBpcyBub3QgeTIwMzggc2FmZS4KClJlcGxhY2UgdXNlIG9mIENVUlJF TlRfVElNRV9TRUMgd2l0aCBrdGltZV9nZXRfcmVhbF9zZWNvbmRzCmluIHNlZ21lbnQgdGltZXN0 YW1wcyB1c2VkIGJ5IEdDIGFsZ29yaXRobSBpbmNsdWRpbmcgdGhlCnNlZ21lbnQgbXRpbWUgdGlt ZXN0YW1wcy4KClNpZ25lZC1vZmYtYnk6IERlZXBhIERpbmFtYW5pIDxkZWVwYS5rZXJuZWxAZ21h aWwuY29tPgpDYzogSmFlZ2V1ayBLaW0gPGphZWdldWtAa2VybmVsLm9yZz4KQ2M6IENoYW5nbWFu IExlZSA8Y20yMjQubGVlQHNhbXN1bmcuY29tPgpDYzogQ2hhbyBZdSA8Y2hhbzIueXVAc2Ftc3Vu Zy5jb20+CkNjOiBsaW51eC1mMmZzLWRldmVsQGxpc3RzLnNvdXJjZWZvcmdlLm5ldAotLS0KIGZz L2YyZnMvc2VnbWVudC5jIHwgMiArLQogZnMvZjJmcy9zZWdtZW50LmggfCA1ICsrKy0tCiAyIGZp bGVzIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9mcy9mMmZzL3NlZ21lbnQuYyBiL2ZzL2YyZnMvc2VnbWVudC5jCmluZGV4IDJlNmY1MzcuLmJk ZTVkYmQgMTAwNjQ0Ci0tLSBhL2ZzL2YyZnMvc2VnbWVudC5jCisrKyBiL2ZzL2YyZnMvc2VnbWVu dC5jCkBAIC0yMTIzLDcgKzIxMjMsNyBAQCBzdGF0aWMgaW50IGJ1aWxkX3NpdF9pbmZvKHN0cnVj dCBmMmZzX3NiX2luZm8gKnNiaSkKIAlzaXRfaS0+ZGlydHlfc2VudHJpZXMgPSAwOwogCXNpdF9p LT5zZW50c19wZXJfYmxvY2sgPSBTSVRfRU5UUllfUEVSX0JMT0NLOwogCXNpdF9pLT5lbGFwc2Vk X3RpbWUgPSBsZTY0X3RvX2NwdShzYmktPmNrcHQtPmVsYXBzZWRfdGltZSk7Ci0Jc2l0X2ktPm1v dW50ZWRfdGltZSA9IENVUlJFTlRfVElNRV9TRUMudHZfc2VjOworCXNpdF9pLT5tb3VudGVkX3Rp bWUgPSBrdGltZV9nZXRfcmVhbF9zZWNvbmRzKCk7CiAJbXV0ZXhfaW5pdCgmc2l0X2ktPnNlbnRy eV9sb2NrKTsKIAlyZXR1cm4gMDsKIH0KZGlmZiAtLWdpdCBhL2ZzL2YyZnMvc2VnbWVudC5oIGIv ZnMvZjJmcy9zZWdtZW50LmgKaW5kZXggN2E3NTZmZi4uZGEzZTg3ZiAxMDA2NDQKLS0tIGEvZnMv ZjJmcy9zZWdtZW50LmgKKysrIGIvZnMvZjJmcy9zZWdtZW50LmgKQEAgLTY1Miw4ICs2NTIsOSBA QCBzdGF0aWMgaW5saW5lIHZvaWQgc2V0X3RvX25leHRfc2l0KHN0cnVjdCBzaXRfaW5mbyAqc2l0 X2ksIHVuc2lnbmVkIGludCBzdGFydCkKIHN0YXRpYyBpbmxpbmUgdW5zaWduZWQgbG9uZyBsb25n IGdldF9tdGltZShzdHJ1Y3QgZjJmc19zYl9pbmZvICpzYmkpCiB7CiAJc3RydWN0IHNpdF9pbmZv ICpzaXRfaSA9IFNJVF9JKHNiaSk7Ci0JcmV0dXJuIHNpdF9pLT5lbGFwc2VkX3RpbWUgKyBDVVJS RU5UX1RJTUVfU0VDLnR2X3NlYyAtCi0JCQkJCQlzaXRfaS0+bW91bnRlZF90aW1lOworCXRpbWU2 NF90IG5vdyA9IGt0aW1lX2dldF9yZWFsX3NlY29uZHMoKTsKKworCXJldHVybiBzaXRfaS0+ZWxh cHNlZF90aW1lICsgbm93IC0gc2l0X2ktPm1vdW50ZWRfdGltZTsKIH0KIAogc3RhdGljIGlubGlu ZSB2b2lkIHNldF9zdW1tYXJ5KHN0cnVjdCBmMmZzX3N1bW1hcnkgKnN1bSwgbmlkX3QgbmlkLAot LSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f ClkyMDM4IG1haWxpbmcgbGlzdApZMjAzOEBsaXN0cy5saW5hcm8ub3JnCmh0dHBzOi8vbGlzdHMu bGluYXJvLm9yZy9tYWlsbWFuL2xpc3RpbmZvL3kyMDM4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Deepa Dinamani To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Arnd Bergmann , Thomas Gleixner , Al Viro , Linus Torvalds , y2038@lists.linaro.org, Jaegeuk Kim , Changman Lee , Chao Yu , linux-f2fs-devel@lists.sourceforge.net Subject: [PATCH 10/21] fs: f2fs: Use ktime_get_real_seconds for sit_info times Date: Wed, 8 Jun 2016 22:04:54 -0700 Message-Id: <1465448705-25055-11-git-send-email-deepa.kernel@gmail.com> In-Reply-To: <1465448705-25055-1-git-send-email-deepa.kernel@gmail.com> References: <1465448705-25055-1-git-send-email-deepa.kernel@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: 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 Cc: Jaegeuk Kim Cc: Changman Lee Cc: Chao Yu Cc: linux-f2fs-devel@lists.sourceforge.net --- 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 2e6f537..bde5dbd 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -2123,7 +2123,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 7a756ff..da3e87f 100644 --- a/fs/f2fs/segment.h +++ b/fs/f2fs/segment.h @@ -652,8 +652,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, -- 1.9.1