Merge tag 'imx-fixes-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / fs / nilfs2 / the_nilfs.h

diff --git a/fs/nilfs2/the_nilfs.h b/fs/nilfs2/the_nilfs.h
index 883d732b02595012212b05efea83af61556c8bd2..36da1779f9766f1e32bc8f8c2de6a7d93413403f 100644 (file)
--- a/fs/nilfs2/the_nilfs.h
+++ b/fs/nilfs2/the_nilfs.h
@@ -116,7 +116,7 @@ struct the_nilfs {
         */
        struct buffer_head     *ns_sbh[2];
        struct nilfs_super_block *ns_sbp[2];
-       time_t                  ns_sbwtime;
+       time64_t                ns_sbwtime;
        unsigned int            ns_sbwcount;
        unsigned int            ns_sbsize;
        unsigned int            ns_mount_state;
@@ -131,8 +131,8 @@ struct the_nilfs {
        __u64                   ns_nextnum;
        unsigned long           ns_pseg_offset;
        __u64                   ns_cno;
-       time_t                  ns_ctime;
-       time_t                  ns_nongc_ctime;
+       time64_t                ns_ctime;
+       time64_t                ns_nongc_ctime;
        atomic_t                ns_ndirtyblks;
 
        /*
@@ -267,7 +267,7 @@ struct nilfs_root {
 
 static inline int nilfs_sb_need_update(struct the_nilfs *nilfs)
 {
-       u64 t = get_seconds();
+       u64 t = ktime_get_real_seconds();
 
        return t < nilfs->ns_sbwtime ||
                t > nilfs->ns_sbwtime + nilfs->ns_sb_update_freq;