lkml.org 
[lkml]   [2017]   [Jan]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH RESEND] fs: f2fs: Use ktime_get_real_seconds for sit_info times
    Date
    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>
    ---
    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 fb57ab9..48efd88 100644
    --- a/fs/f2fs/segment.c
    +++ b/fs/f2fs/segment.c
    @@ -2423,7 +2423,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 5cb5755..cd40c34 100644
    --- a/fs/f2fs/segment.h
    +++ b/fs/f2fs/segment.h
    @@ -691,8 +691,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
    \
     
     \ /
      Last update: 2017-01-22 00:08    [W:2.869 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site