From: Deepa Dinamani <deepa.kernel@gmail.com>
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 <jaegeuk@kernel.org>,
Changman Lee <cm224.lee@samsung.com>,
linux-f2fs-devel@lists.sourceforge.net
Subject: [PATCH v4 15/26] fs: f2fs: Use ktime_get_real_seconds for sit_info times
Date: Sat, 13 Aug 2016 15:48:27 -0700 [thread overview]
Message-ID: <1471128518-24075-16-git-send-email-deepa.kernel@gmail.com> (raw)
In-Reply-To: <1471128518-24075-1-git-send-email-deepa.kernel@gmail.com>
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 <deepa.kernel@gmail.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Cc: Jaegeuk Kim <jaegeuk@kernel.org>
Cc: Changman Lee <cm224.lee@samsung.com>
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,
--
1.9.1
next prev parent reply other threads:[~2016-08-14 11:09 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-13 22:48 [GIT PULL] [PATCH v4 00/26] Delete CURRENT_TIME and CURRENT_TIME_SEC macros Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 01/26] vfs: Add current_time() api Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 02/26] fs: proc: Delete inode time initializations in proc_alloc_inode() Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 03/26] fs: Replace CURRENT_TIME with current_time() for inode timestamps Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 04/26] fs: Replace CURRENT_TIME_SEC " Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 05/26] fs: Replace current_fs_time() with current_time() Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 06/26] fs: ufs: Use ktime_get_real_ts64() for birthtime Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 07/26] fs: jfs: Replace CURRENT_TIME_SEC by current_time() Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 08/26] fs: ext4: Use current_time() for inode timestamps Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 09/26] fs: ubifs: Replace CURRENT_TIME_SEC with current_time Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 10/26] fs: btrfs: Use ktime_get_real_ts for root ctime Deepa Dinamani
2016-08-15 13:26 ` David Sterba
2016-08-13 22:48 ` [PATCH v4 11/26] fs: udf: Replace CURRENT_TIME with current_time() Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 12/26] fs: cifs: Replace CURRENT_TIME by current_time() Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 13/26] fs: cifs: Replace CURRENT_TIME with ktime_get_real_ts() Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 14/26] fs: cifs: Replace CURRENT_TIME by get_seconds Deepa Dinamani
2016-08-13 22:48 ` Deepa Dinamani [this message]
2016-08-13 22:48 ` [PATCH v4 16/26] drivers: staging: lustre: Replace CURRENT_TIME with current_time() Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 17/26] fs: ocfs2: Use time64_t to represent orphan scan times Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 18/26] fs: ocfs2: Replace CURRENT_TIME macro Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 19/26] audit: Use timespec64 to represent audit timestamps Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 20/26] fs: nfs: Make nfs boot time y2038 safe Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 21/26] block: Replace CURRENT_TIME with ktime_get_real_ts Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 22/26] libceph: " Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 23/26] fs: ceph: Replace current_fs_time for request stamp Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 24/26] fnic: Use time64_t to represent trace timestamps Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 25/26] time: Delete current_fs_time() function Deepa Dinamani
2016-08-17 20:02 ` John Stultz
2016-08-13 22:48 ` [PATCH v4 26/26] time: Delete CURRENT_TIME_SEC and CURRENT_TIME Deepa Dinamani
2016-08-15 16:23 ` [GIT PULL] [PATCH v4 00/26] Delete CURRENT_TIME and CURRENT_TIME_SEC macros Greg KH
2016-08-16 18:18 ` Deepa Dinamani
2016-08-16 18:53 ` Greg KH
2016-08-23 14:51 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1471128518-24075-16-git-send-email-deepa.kernel@gmail.com \
--to=deepa.kernel@gmail.com \
--cc=arnd@arndb.de \
--cc=cm224.lee@samsung.com \
--cc=jaegeuk@kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
--cc=y2038@lists.linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).