fs: Replace CURRENT_TIME_SEC with current_time() for inode timestamps

CURRENT_TIME_SEC is not y2038 safe. current_time() will
be transitioned to use 64 bit time along with vfs in a
separate patch.
There is no plan to transistion CURRENT_TIME_SEC to use
y2038 safe time interfaces.

current_time() will also be extended to use superblock
range checking parameters when range checking is introduced.

This works because alloc_super() fills in the the s_time_gran
in super block to NSEC_PER_SEC.

Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Acked-by: Jan Kara <jack@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

7 files changed, 13 insertions, 13 deletions

diff --git a/fs/ext2/acl.c b/fs/ext2/acl.c
index 42f1d1814083..80c1e579428a 100644
--- a/fs/ext2/acl.c
+++ b/fs/ext2/acl.c
@@ -194,7 +194,7 @@ ext2_set_acl(struct inode *inode, struct posix_acl *acl, int type)
                                 if (error < 0)
                                         return error;
                                 else {
-                                        inode->i_ctime = CURRENT_TIME_SEC;
+                                        inode->i_ctime = current_time(inode);
                                         mark_inode_dirty(inode);
                                         if (error == 0)
                                                 acl = NULL;
diff --git a/fs/ext2/dir.c b/fs/ext2/dir.c
index 61ad490ed67b..d9650c9508e4 100644
--- a/fs/ext2/dir.c
+++ b/fs/ext2/dir.c
@@ -471,7 +471,7 @@ void ext2_set_link(struct inode *dir, struct ext2_dir_entry_2 *de,
         err = ext2_commit_chunk(page, pos, len);
         ext2_put_page(page);
         if (update_times)
-                dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;
+                dir->i_mtime = dir->i_ctime = current_time(dir);
         EXT2_I(dir)->i_flags &= ~EXT2_BTREE_FL;
         mark_inode_dirty(dir);
 }
@@ -561,7 +561,7 @@ got_it:
         de->inode = cpu_to_le32(inode->i_ino);
         ext2_set_de_type (de, inode);
         err = ext2_commit_chunk(page, pos, rec_len);
-        dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;
+        dir->i_mtime = dir->i_ctime = current_time(dir);
         EXT2_I(dir)->i_flags &= ~EXT2_BTREE_FL;
         mark_inode_dirty(dir);
         /* OFFSET_CACHE */
@@ -610,7 +610,7 @@ int ext2_delete_entry (struct ext2_dir_entry_2 * dir, struct page * page )
                 pde->rec_len = ext2_rec_len_to_disk(to - from);
         dir->inode = 0;
         err = ext2_commit_chunk(page, pos, to - from);
-        inode->i_ctime = inode->i_mtime = CURRENT_TIME_SEC;
+        inode->i_ctime = inode->i_mtime = current_time(inode);
         EXT2_I(inode)->i_flags &= ~EXT2_BTREE_FL;
         mark_inode_dirty(inode);
 out:
diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c
index efe5fb21c533..43dc9c54335c 100644
--- a/fs/ext2/ialloc.c
+++ b/fs/ext2/ialloc.c
@@ -551,7 +551,7 @@ got:
 
         inode->i_ino = ino;
         inode->i_blocks = 0;
-        inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
+        inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
         memset(ei->i_data, 0, sizeof(ei->i_data));
         ei->i_flags =
                 ext2_mask_flags(mode, EXT2_I(dir)->i_flags & EXT2_FL_INHERITED);
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index d5c7d09919f3..b66a6585a521 100644
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -594,7 +594,7 @@ static void ext2_splice_branch(struct inode *inode,
         if (where->bh)
                 mark_buffer_dirty_inode(where->bh, inode);
 
-        inode->i_ctime = CURRENT_TIME_SEC;
+        inode->i_ctime = current_time(inode);
         mark_inode_dirty(inode);
 }
 
@@ -1236,7 +1236,7 @@ static int ext2_setsize(struct inode *inode, loff_t newsize)
         __ext2_truncate_blocks(inode, newsize);
         dax_sem_up_write(EXT2_I(inode));
 
-        inode->i_mtime = inode->i_ctime = CURRENT_TIME_SEC;
+        inode->i_mtime = inode->i_ctime = current_time(inode);
         if (inode_needs_sync(inode)) {
                 sync_mapping_buffers(inode->i_mapping);
                 sync_inode_metadata(inode, 1);
diff --git a/fs/ext2/ioctl.c b/fs/ext2/ioctl.c
index b386af2e45f4..9d617423e936 100644
--- a/fs/ext2/ioctl.c
+++ b/fs/ext2/ioctl.c
@@ -79,7 +79,7 @@ long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                 ei->i_flags = flags;
 
                 ext2_set_inode_flags(inode);
-                inode->i_ctime = CURRENT_TIME_SEC;
+                inode->i_ctime = current_time(inode);
                 inode_unlock(inode);
 
                 mark_inode_dirty(inode);
@@ -103,7 +103,7 @@ setflags_out:
                 }
 
                 inode_lock(inode);
-                inode->i_ctime = CURRENT_TIME_SEC;
+                inode->i_ctime = current_time(inode);
                 inode->i_generation = generation;
                 inode_unlock(inode);
 
diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c
index d446203127fc..edb7b8c116eb 100644
--- a/fs/ext2/namei.c
+++ b/fs/ext2/namei.c
@@ -221,7 +221,7 @@ static int ext2_link (struct dentry * old_dentry, struct inode * dir,
         if (err)
                 return err;
 
-        inode->i_ctime = CURRENT_TIME_SEC;
+        inode->i_ctime = current_time(inode);
         inode_inc_link_count(inode);
         ihold(inode);
 
@@ -372,7 +372,7 @@ static int ext2_rename (struct inode * old_dir, struct dentry * old_dentry,
                 if (!new_de)
                         goto out_dir;
                 ext2_set_link(new_dir, new_de, new_page, old_inode, 1);
-                new_inode->i_ctime = CURRENT_TIME_SEC;
+                new_inode->i_ctime = current_time(new_inode);
                 if (dir_de)
                         drop_nlink(new_inode);
                 inode_dec_link_count(new_inode);
@@ -388,7 +388,7 @@ static int ext2_rename (struct inode * old_dir, struct dentry * old_dentry,
          * Like most other Unix systems, set the ctime for inodes on a
          * rename.
          */
-        old_inode->i_ctime = CURRENT_TIME_SEC;
+        old_inode->i_ctime = current_time(old_inode);
         mark_inode_dirty(old_inode);
 
         ext2_delete_entry (old_de, old_page);
diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
index b7f896f3f7a7..fbdb8f171893 100644
--- a/fs/ext2/xattr.c
+++ b/fs/ext2/xattr.c
@@ -691,7 +691,7 @@ ext2_xattr_set2(struct inode *inode, struct buffer_head *old_bh,
 
         /* Update the inode. */
         EXT2_I(inode)->i_file_acl = new_bh ? new_bh->b_blocknr : 0;
-        inode->i_ctime = CURRENT_TIME_SEC;
+        inode->i_ctime = current_time(inode);
         if (IS_SYNC(inode)) {
                 error = sync_inode_metadata(inode, 1);
                 /* In case sync failed due to ENOSPC the inode was actually