fs: Replace CURRENT_TIME with current_time() for inode timestamps

CURRENT_TIME macro is not appropriate for filesystems as it
doesn't use the right granularity for filesystem timestamps.
Use current_time() instead.

CURRENT_TIME is also not y2038 safe.

This is also in preparation for the patch that transitions
vfs timestamps to use 64 bit time and hence make them
y2038 safe. As part of the effort current_time() will be
extended to do range checks. Hence, it is necessary for all
file system timestamps to use current_time(). Also,
current_time() will be transitioned along with vfs to be
y2038 safe.

Note that whenever a single call to current_time() is used
to change timestamps in different inodes, it is because they
share the same time granularity.

Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Felipe Balbi <balbi@kernel.org>
Acked-by: Steven Whitehouse <swhiteho@redhat.com>
Acked-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Acked-by: David Sterba <dsterba@suse.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 6 insertions, 6 deletions

diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 4e7b0dc22450..9adcac9dfda1 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -253,7 +253,7 @@ int ocfs2_should_update_atime(struct inode *inode,
                 return 0;
         }
 
-        now = CURRENT_TIME;
+        now = current_time(inode);
         if ((now.tv_sec - inode->i_atime.tv_sec <= osb->s_atime_quantum))
                 return 0;
         else
@@ -287,7 +287,7 @@ int ocfs2_update_inode_atime(struct inode *inode,
          * have i_mutex to guard against concurrent changes to other
          * inode fields.
          */
-        inode->i_atime = CURRENT_TIME;
+        inode->i_atime = current_time(inode);
         di->i_atime = cpu_to_le64(inode->i_atime.tv_sec);
         di->i_atime_nsec = cpu_to_le32(inode->i_atime.tv_nsec);
         ocfs2_update_inode_fsync_trans(handle, inode, 0);
@@ -308,7 +308,7 @@ int ocfs2_set_inode_size(handle_t *handle,
 
         i_size_write(inode, new_i_size);
         inode->i_blocks = ocfs2_inode_sector_count(inode);
-        inode->i_ctime = inode->i_mtime = CURRENT_TIME;
+        inode->i_ctime = inode->i_mtime = current_time(inode);
 
         status = ocfs2_mark_inode_dirty(handle, inode, fe_bh);
         if (status < 0) {
@@ -429,7 +429,7 @@ static int ocfs2_orphan_for_truncate(struct ocfs2_super *osb,
         }
 
         i_size_write(inode, new_i_size);
-        inode->i_ctime = inode->i_mtime = CURRENT_TIME;
+        inode->i_ctime = inode->i_mtime = current_time(inode);
 
         di = (struct ocfs2_dinode *) fe_bh->b_data;
         di->i_size = cpu_to_le64(new_i_size);
@@ -840,7 +840,7 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,
         i_size_write(inode, abs_to);
         inode->i_blocks = ocfs2_inode_sector_count(inode);
         di->i_size = cpu_to_le64((u64)i_size_read(inode));
-        inode->i_mtime = inode->i_ctime = CURRENT_TIME;
+        inode->i_mtime = inode->i_ctime = current_time(inode);
         di->i_mtime = di->i_ctime = cpu_to_le64(inode->i_mtime.tv_sec);
         di->i_ctime_nsec = cpu_to_le32(inode->i_mtime.tv_nsec);
         di->i_mtime_nsec = di->i_ctime_nsec;
@@ -1936,7 +1936,7 @@ static int __ocfs2_change_file_space(struct file *file, struct inode *inode,
         if (change_size && i_size_read(inode) < size)
                 i_size_write(inode, size);
 
-        inode->i_ctime = inode->i_mtime = CURRENT_TIME;
+        inode->i_ctime = inode->i_mtime = current_time(inode);
         ret = ocfs2_mark_inode_dirty(handle, inode, di_bh);
         if (ret < 0)
                 mlog_errno(ret);