From mboxrd@z Thu Jan 1 00:00:00 1970 From: Deepa Dinamani Subject: [PATCH] fs: f2fs: Use ktime_get_real_seconds for sit_info times Date: Sat, 1 Oct 2016 16:31:24 -0700 Message-ID: <1475364684-6557-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: linux-kernel@vger.kernel.org Cc: y2038@lists.linaro.org, Jaegeuk Kim , Changman Lee , arnd@arndb.de, linux-f2fs-devel@lists.sourceforge.net List-Id: linux-f2fs-devel.lists.sourceforge.net Q1VSUkVOVF9USU1FX1NFQyBpcyBub3QgeTIwMzggc2FmZS4KClJlcGxhY2UgdXNlIG9mIENVUlJF TlRfVElNRV9TRUMgd2l0aCBrdGltZV9nZXRfcmVhbF9zZWNvbmRzCmluIHNlZ21lbnQgdGltZXN0 YW1wcyB1c2VkIGJ5IEdDIGFsZ29yaXRobSBpbmNsdWRpbmcgdGhlCnNlZ21lbnQgbXRpbWUgdGlt ZXN0YW1wcy4KClNpZ25lZC1vZmYtYnk6IERlZXBhIERpbmFtYW5pIDxkZWVwYS5rZXJuZWxAZ21h aWwuY29tPgpSZXZpZXdlZC1ieTogQXJuZCBCZXJnbWFubiA8YXJuZEBhcm5kYi5kZT4KQ2M6IEph ZWdldWsgS2ltIDxqYWVnZXVrQGtlcm5lbC5vcmc+CkNjOiBDaGFuZ21hbiBMZWUgPGNtMjI0Lmxl ZUBzYW1zdW5nLmNvbT4KQ2M6IGxpbnV4LWYyZnMtZGV2ZWxAbGlzdHMuc291cmNlZm9yZ2UubmV0 Ci0tLQogZnMvZjJmcy9zZWdtZW50LmMgfCAyICstCiBmcy9mMmZzL3NlZ21lbnQuaCB8IDUgKysr LS0KIDIgZmlsZXMgY2hhbmdlZCwgNCBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2ZzL2YyZnMvc2VnbWVudC5jIGIvZnMvZjJmcy9zZWdtZW50LmMKaW5kZXggYTQ2 Mjk2Zi4uMzRiYjMwZSAxMDA2NDQKLS0tIGEvZnMvZjJmcy9zZWdtZW50LmMKKysrIGIvZnMvZjJm cy9zZWdtZW50LmMKQEAgLTIxNjgsNyArMjE2OCw3IEBAIHN0YXRpYyBpbnQgYnVpbGRfc2l0X2lu Zm8oc3RydWN0IGYyZnNfc2JfaW5mbyAqc2JpKQogCXNpdF9pLT5kaXJ0eV9zZW50cmllcyA9IDA7 CiAJc2l0X2ktPnNlbnRzX3Blcl9ibG9jayA9IFNJVF9FTlRSWV9QRVJfQkxPQ0s7CiAJc2l0X2kt PmVsYXBzZWRfdGltZSA9IGxlNjRfdG9fY3B1KHNiaS0+Y2twdC0+ZWxhcHNlZF90aW1lKTsKLQlz aXRfaS0+bW91bnRlZF90aW1lID0gQ1VSUkVOVF9USU1FX1NFQy50dl9zZWM7CisJc2l0X2ktPm1v dW50ZWRfdGltZSA9IGt0aW1lX2dldF9yZWFsX3NlY29uZHMoKTsKIAltdXRleF9pbml0KCZzaXRf aS0+c2VudHJ5X2xvY2spOwogCXJldHVybiAwOwogfQpkaWZmIC0tZ2l0IGEvZnMvZjJmcy9zZWdt ZW50LmggYi9mcy9mMmZzL3NlZ21lbnQuaAppbmRleCBiMzNmNzNlLi4yNDIzNzQ5IDEwMDY0NAot LS0gYS9mcy9mMmZzL3NlZ21lbnQuaAorKysgYi9mcy9mMmZzL3NlZ21lbnQuaApAQCAtNjYyLDgg KzY2Miw5IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBzZXRfdG9fbmV4dF9zaXQoc3RydWN0IHNpdF9p bmZvICpzaXRfaSwgdW5zaWduZWQgaW50IHN0YXJ0KQogc3RhdGljIGlubGluZSB1bnNpZ25lZCBs b25nIGxvbmcgZ2V0X210aW1lKHN0cnVjdCBmMmZzX3NiX2luZm8gKnNiaSkKIHsKIAlzdHJ1Y3Qg c2l0X2luZm8gKnNpdF9pID0gU0lUX0koc2JpKTsKLQlyZXR1cm4gc2l0X2ktPmVsYXBzZWRfdGlt ZSArIENVUlJFTlRfVElNRV9TRUMudHZfc2VjIC0KLQkJCQkJCXNpdF9pLT5tb3VudGVkX3RpbWU7 CisJdGltZTY0X3Qgbm93ID0ga3RpbWVfZ2V0X3JlYWxfc2Vjb25kcygpOworCisJcmV0dXJuIHNp dF9pLT5lbGFwc2VkX3RpbWUgKyBub3cgLSBzaXRfaS0+bW91bnRlZF90aW1lOwogfQogCiBzdGF0 aWMgaW5saW5lIHZvaWQgc2V0X3N1bW1hcnkoc3RydWN0IGYyZnNfc3VtbWFyeSAqc3VtLCBuaWRf dCBuaWQsCi0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KWTIwMzggbWFpbGluZyBsaXN0ClkyMDM4QGxpc3RzLmxpbmFyby5vcmcKaHR0cHM6 Ly9saXN0cy5saW5hcm8ub3JnL21haWxtYW4vbGlzdGluZm8veTIwMzgK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751919AbcJAXbu (ORCPT ); Sat, 1 Oct 2016 19:31:50 -0400 Received: from mail-pa0-f65.google.com ([209.85.220.65]:34698 "EHLO mail-pa0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751388AbcJAXbm (ORCPT ); Sat, 1 Oct 2016 19:31:42 -0400 From: Deepa Dinamani To: linux-kernel@vger.kernel.org Cc: arnd@arndb.de, y2038@lists.linaro.org, Jaegeuk Kim , Changman Lee , linux-f2fs-devel@lists.sourceforge.net Subject: [PATCH] fs: f2fs: Use ktime_get_real_seconds for sit_info times Date: Sat, 1 Oct 2016 16:31:24 -0700 Message-Id: <1475364684-6557-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 Reviewed-by: Arnd Bergmann Cc: Jaegeuk Kim Cc: Changman Lee 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 a46296f..34bb30e 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -2168,7 +2168,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 b33f73e..2423749 100644 --- a/fs/f2fs/segment.h +++ b/fs/f2fs/segment.h @@ -662,8 +662,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