From mboxrd@z Thu Jan 1 00:00:00 1970 From: Deepa Dinamani Subject: [PATCH v2 13/24] fs: f2fs: Use ktime_get_real_seconds for sit_info times Date: Sun, 19 Jun 2016 17:27:12 -0700 Message-ID: <1466382443-11063-14-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: Changman Lee , tytso@mit.edu, arnd@arndb.de, y2038@lists.linaro.org, linux-f2fs-devel@lists.sourceforge.net, viro@zeniv.linux.org.uk, Jaegeuk Kim , tglx@linutronix.de, torvalds@linux-foundation.org List-Id: linux-f2fs-devel.lists.sourceforge.net Q1VSUkVOVF9USU1FX1NFQyBpcyBub3QgeTIwMzggc2FmZS4KClJlcGxhY2UgdXNlIG9mIENVUlJF TlRfVElNRV9TRUMgd2l0aCBrdGltZV9nZXRfcmVhbF9zZWNvbmRzCmluIHNlZ21lbnQgdGltZXN0 YW1wcyB1c2VkIGJ5IEdDIGFsZ29yaXRobSBpbmNsdWRpbmcgdGhlCnNlZ21lbnQgbXRpbWUgdGlt ZXN0YW1wcy4KClNpZ25lZC1vZmYtYnk6IERlZXBhIERpbmFtYW5pIDxkZWVwYS5rZXJuZWxAZ21h aWwuY29tPgpDYzogSmFlZ2V1ayBLaW0gPGphZWdldWtAa2VybmVsLm9yZz4KQ2M6IENoYW5nbWFu IExlZSA8Y20yMjQubGVlQHNhbXN1bmcuY29tPgpDYzogbGludXgtZjJmcy1kZXZlbEBsaXN0cy5z b3VyY2Vmb3JnZS5uZXQKLS0tCiBmcy9mMmZzL3NlZ21lbnQuYyB8IDIgKy0KIGZzL2YyZnMvc2Vn bWVudC5oIHwgNSArKystLQogMiBmaWxlcyBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyksIDMgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZnMvZjJmcy9zZWdtZW50LmMgYi9mcy9mMmZzL3NlZ21l bnQuYwppbmRleCAyNWIxYzQ3Li45YzM1YTIxIDEwMDY0NAotLS0gYS9mcy9mMmZzL3NlZ21lbnQu YworKysgYi9mcy9mMmZzL3NlZ21lbnQuYwpAQCAtMjE1Niw3ICsyMTU2LDcgQEAgc3RhdGljIGlu dCBidWlsZF9zaXRfaW5mbyhzdHJ1Y3QgZjJmc19zYl9pbmZvICpzYmkpCiAJc2l0X2ktPmRpcnR5 X3NlbnRyaWVzID0gMDsKIAlzaXRfaS0+c2VudHNfcGVyX2Jsb2NrID0gU0lUX0VOVFJZX1BFUl9C TE9DSzsKIAlzaXRfaS0+ZWxhcHNlZF90aW1lID0gbGU2NF90b19jcHUoc2JpLT5ja3B0LT5lbGFw c2VkX3RpbWUpOwotCXNpdF9pLT5tb3VudGVkX3RpbWUgPSBDVVJSRU5UX1RJTUVfU0VDLnR2X3Nl YzsKKwlzaXRfaS0+bW91bnRlZF90aW1lID0ga3RpbWVfZ2V0X3JlYWxfc2Vjb25kcygpOwogCW11 dGV4X2luaXQoJnNpdF9pLT5zZW50cnlfbG9jayk7CiAJcmV0dXJuIDA7CiB9CmRpZmYgLS1naXQg YS9mcy9mMmZzL3NlZ21lbnQuaCBiL2ZzL2YyZnMvc2VnbWVudC5oCmluZGV4IGQ3NGNjMzMuLjc4 YmIwMzQgMTAwNjQ0Ci0tLSBhL2ZzL2YyZnMvc2VnbWVudC5oCisrKyBiL2ZzL2YyZnMvc2VnbWVu dC5oCkBAIC02NjEsOCArNjYxLDkgQEAgc3RhdGljIGlubGluZSB2b2lkIHNldF90b19uZXh0X3Np dChzdHJ1Y3Qgc2l0X2luZm8gKnNpdF9pLCB1bnNpZ25lZCBpbnQgc3RhcnQpCiBzdGF0aWMgaW5s aW5lIHVuc2lnbmVkIGxvbmcgbG9uZyBnZXRfbXRpbWUoc3RydWN0IGYyZnNfc2JfaW5mbyAqc2Jp KQogewogCXN0cnVjdCBzaXRfaW5mbyAqc2l0X2kgPSBTSVRfSShzYmkpOwotCXJldHVybiBzaXRf aS0+ZWxhcHNlZF90aW1lICsgQ1VSUkVOVF9USU1FX1NFQy50dl9zZWMgLQotCQkJCQkJc2l0X2kt Pm1vdW50ZWRfdGltZTsKKwl0aW1lNjRfdCBub3cgPSBrdGltZV9nZXRfcmVhbF9zZWNvbmRzKCk7 CisKKwlyZXR1cm4gc2l0X2ktPmVsYXBzZWRfdGltZSArIG5vdyAtIHNpdF9pLT5tb3VudGVkX3Rp bWU7CiB9CiAKIHN0YXRpYyBpbmxpbmUgdm9pZCBzZXRfc3VtbWFyeShzdHJ1Y3QgZjJmc19zdW1t YXJ5ICpzdW0sIG5pZF90IG5pZCwKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpZMjAzOCBtYWlsaW5nIGxpc3QKWTIwMzhAbGlzdHMubGlu YXJvLm9yZwpodHRwczovL2xpc3RzLmxpbmFyby5vcmcvbWFpbG1hbi9saXN0aW5mby95MjAzOAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f194.google.com ([209.85.192.194]:34505 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751705AbcFTBU1 (ORCPT ); Sun, 19 Jun 2016 21:20:27 -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, Jaegeuk Kim , Changman Lee , linux-f2fs-devel@lists.sourceforge.net Subject: [PATCH v2 13/24] fs: f2fs: Use ktime_get_real_seconds for sit_info times Date: Sun, 19 Jun 2016 17:27:12 -0700 Message-Id: <1466382443-11063-14-git-send-email-deepa.kernel@gmail.com> 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-fsdevel-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: 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 25b1c47..9c35a21 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -2156,7 +2156,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 d74cc33..78bb034 100644 --- a/fs/f2fs/segment.h +++ b/fs/f2fs/segment.h @@ -661,8 +661,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