diff options
| author | Chao Yu <yuchao0@huawei.com> | 2018-06-04 23:20:17 +0800 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2018-06-04 14:31:11 -0700 |
| commit | a1f72ac2c0a8d8a3488b31867c9255264331a4db (patch) | |
| tree | f61d166a69bd130f8cade778733f9170a52ce4c0 /fs/f2fs/segment.h | |
| parent | 1061fd484bd442392c7bd491f7f154b1ce233173 (diff) | |
| download | talos-obmc-linux-a1f72ac2c0a8d8a3488b31867c9255264331a4db.tar.gz talos-obmc-linux-a1f72ac2c0a8d8a3488b31867c9255264331a4db.zip | |
f2fs: fix to update mtime correctly
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>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs/segment.h')
| -rw-r--r-- | fs/f2fs/segment.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h index c574131ac7e1..f18fc82fbe99 100644 --- a/fs/f2fs/segment.h +++ b/fs/f2fs/segment.h @@ -745,12 +745,23 @@ static inline void set_to_next_sit(struct sit_info *sit_i, unsigned int start) #endif } -static inline unsigned long long get_mtime(struct f2fs_sb_info *sbi) +static inline unsigned long long get_mtime(struct f2fs_sb_info *sbi, + bool base_time) { struct sit_info *sit_i = SIT_I(sbi); - time64_t now = ktime_get_real_seconds(); + time64_t diff, now = ktime_get_real_seconds(); - return sit_i->elapsed_time + now - sit_i->mounted_time; + if (now >= sit_i->mounted_time) + return sit_i->elapsed_time + now - sit_i->mounted_time; + + /* system time is set to the past */ + if (!base_time) { + diff = sit_i->mounted_time - now; + if (sit_i->elapsed_time >= diff) + return sit_i->elapsed_time - diff; + return 0; + } + return sit_i->elapsed_time; } static inline void set_summary(struct f2fs_summary *sum, nid_t nid, |
