From: Chao Yu <yuchao0@huawei.com>
To: <jaegeuk@kernel.org>
Cc: <linux-f2fs-devel@lists.sourceforge.net>,
<linux-kernel@vger.kernel.org>, <chao@kernel.org>,
Chao Yu <yuchao0@huawei.com>
Subject: [PATCH 2/2] f2fs: fix to update mtime correctly
Date: Wed, 30 May 2018 18:11:31 +0800 [thread overview]
Message-ID: <20180530101131.107083-2-yuchao0@huawei.com> (raw)
In-Reply-To: <20180530101131.107083-1-yuchao0@huawei.com>
If we change system time to the past, get_mtime() will return a
overflowed time, and SIT_I(sbi)->max_mtime will be udpated
incorrectly, this patch fixes the two issues.
Signed-off-by: Chao Yu <yuchao0@huawei.com>
---
fs/f2fs/segment.c | 3 ++-
fs/f2fs/segment.h | 14 +++++++++++---
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 8ef87f6e0fb2..91af3e8c9065 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1821,7 +1821,8 @@ static void update_sit_entry(struct f2fs_sb_info *sbi, block_t blkaddr, int del)
se->valid_blocks = new_vblocks;
se->mtime = get_mtime(sbi);
- SIT_I(sbi)->max_mtime = se->mtime;
+ if (se->mtime > SIT_I(sbi)->max_mtime)
+ SIT_I(sbi)->max_mtime = se->mtime;
/* Update valid block bitmap */
if (del > 0) {
diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
index c574131ac7e1..fe4ea82b08aa 100644
--- a/fs/f2fs/segment.h
+++ b/fs/f2fs/segment.h
@@ -748,9 +748,17 @@ 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);
- time64_t now = ktime_get_real_seconds();
-
- return sit_i->elapsed_time + now - sit_i->mounted_time;
+ time64_t diff = 0, now = ktime_get_real_seconds();
+
+ if (now >= sit_i->mounted_time) {
+ diff = now - sit_i->mounted_time;
+ } else {
+ /* system time is set to the past */
+ diff = sit_i->mounted_time - now;
+ if (sit_i->elapsed_time >= diff)
+ return sit_i->elapsed_time - diff;
+ }
+ return sit_i->elapsed_time + diff;
}
static inline void set_summary(struct f2fs_summary *sum, nid_t nid,
--
2.17.0.391.g1f1cddd558b5
prev parent reply other threads:[~2018-05-30 10:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-30 10:11 [PATCH 1/2] f2fs: fix to correct return value of f2fs_trim_fs Chao Yu
2018-05-30 10:11 ` Chao Yu [this message]
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=20180530101131.107083-2-yuchao0@huawei.com \
--to=yuchao0@huawei.com \
--cc=chao@kernel.org \
--cc=jaegeuk@kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.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).