ocfs2: replace CURRENT_TIME macro

CURRENT_TIME is not y2038 safe.

Use y2038 safe ktime_get_real_seconds() here for timestamps.  struct
heartbeat_block's hb_seq and deletetion time are already 64 bits wide
and accommodate times beyond y2038.

Also use y2038 safe ktime_get_real_ts64() for on disk inode timestamps.
These are also wide enough to accommodate time64_t.

Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Deepa Dinamani <[email protected]>
Reviewed-by: Arnd Bergmann <[email protected]>
Cc: Mark Fasheh <[email protected]>
Cc: Joel Becker <[email protected]>
Cc: Junxiao Bi <[email protected]>
Cc: Joseph Qi <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index 636abcbd46501b9c00ef5e3155d6656a161d7d49..9158c982509468d8b22281e4e87907a0d00f0e1c 100644 (file)
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -741,7 +741,7 @@ static inline void o2hb_prepare_block(struct o2hb_region *reg,
        hb_block = (struct o2hb_disk_heartbeat_block *)slot->ds_raw_block;
        memset(hb_block, 0, reg->hr_block_bytes);
        /* TODO: time stuff */
-       cputime = CURRENT_TIME.tv_sec;
+       cputime = ktime_get_real_seconds();
        if (!cputime)
                cputime = 1;
 

diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index c56a7679df93a2bc3df147fe8f408b74221988cb..382401d3e88fc0aefb5df3f35cc731b117eea11c 100644 (file)
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -703,7 +703,7 @@ static int ocfs2_remove_inode(struct inode *inode,
                goto bail_commit;
        }
 
-       di->i_dtime = cpu_to_le64(CURRENT_TIME.tv_sec);
+       di->i_dtime = cpu_to_le64(ktime_get_real_seconds());
        di->i_flags &= cpu_to_le32(~(OCFS2_VALID_FL | OCFS2_ORPHANED_FL));
        ocfs2_journal_dirty(handle, di_bh);
 

diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index 8d887c75765cf3169040d9b24068e6491cf365a7..3b0a10d9b36f3d2f652deba76eb9f3b8f66a0ced 100644 (file)
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -516,6 +516,7 @@ static int __ocfs2_mknod_locked(struct inode *dir,
        struct ocfs2_extent_list *fel;
        u16 feat;
        struct ocfs2_inode_info *oi = OCFS2_I(inode);
+       struct timespec64 ts;
 
        *new_fe_bh = NULL;
 
@@ -564,10 +565,11 @@ static int __ocfs2_mknod_locked(struct inode *dir,
        fe->i_last_eb_blk = 0;
        strcpy(fe->i_signature, OCFS2_INODE_SIGNATURE);
        fe->i_flags |= cpu_to_le32(OCFS2_VALID_FL);
+       ktime_get_real_ts64(&ts);
        fe->i_atime = fe->i_ctime = fe->i_mtime =
-               cpu_to_le64(CURRENT_TIME.tv_sec);
+               cpu_to_le64(ts.tv_sec);
        fe->i_mtime_nsec = fe->i_ctime_nsec = fe->i_atime_nsec =
-               cpu_to_le32(CURRENT_TIME.tv_nsec);
+               cpu_to_le32(ts.tv_nsec);
        fe->i_dtime = 0;
 
        /*