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>

3 files changed, 6 insertions, 6 deletions

diff --git a/fs/hfs/catalog.c b/fs/hfs/catalog.c
index 8f4afd3f5108..8a66405b0f8b 100644
--- a/fs/hfs/catalog.c
+++ b/fs/hfs/catalog.c
@@ -125,7 +125,7 @@ int hfs_cat_create(u32 cnid, struct inode *dir, const struct qstr *str, struct i
                 goto err1;
 
         dir->i_size++;
-        dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;
+        dir->i_mtime = dir->i_ctime = current_time(dir);
         mark_inode_dirty(dir);
         hfs_find_exit(&fd);
         return 0;
@@ -261,7 +261,7 @@ int hfs_cat_delete(u32 cnid, struct inode *dir, const struct qstr *str)
         }
 
         dir->i_size--;
-        dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;
+        dir->i_mtime = dir->i_ctime = current_time(dir);
         mark_inode_dirty(dir);
         res = 0;
 out:
@@ -321,7 +321,7 @@ int hfs_cat_move(u32 cnid, struct inode *src_dir, const struct qstr *src_name,
         if (err)
                 goto out;
         dst_dir->i_size++;
-        dst_dir->i_mtime = dst_dir->i_ctime = CURRENT_TIME_SEC;
+        dst_dir->i_mtime = dst_dir->i_ctime = current_time(dst_dir);
         mark_inode_dirty(dst_dir);
 
         /* finally remove the old entry */
@@ -333,7 +333,7 @@ int hfs_cat_move(u32 cnid, struct inode *src_dir, const struct qstr *src_name,
         if (err)
                 goto out;
         src_dir->i_size--;
-        src_dir->i_mtime = src_dir->i_ctime = CURRENT_TIME_SEC;
+        src_dir->i_mtime = src_dir->i_ctime = current_time(src_dir);
         mark_inode_dirty(src_dir);
 
         type = entry.type;
diff --git a/fs/hfs/dir.c b/fs/hfs/dir.c
index 163190ecc0d2..4f379fb91691 100644
--- a/fs/hfs/dir.c
+++ b/fs/hfs/dir.c
@@ -268,7 +268,7 @@ static int hfs_remove(struct inode *dir, struct dentry *dentry)
         if (res)
                 return res;
         clear_nlink(inode);
-        inode->i_ctime = CURRENT_TIME_SEC;
+        inode->i_ctime = current_time(inode);
         hfs_delete_inode(inode);
         mark_inode_dirty(inode);
         return 0;
diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c
index c6a32415735b..b8b57ecbe1ab 100644
--- a/fs/hfs/inode.c
+++ b/fs/hfs/inode.c
@@ -193,7 +193,7 @@ struct inode *hfs_new_inode(struct inode *dir, const struct qstr *name, umode_t
         inode->i_uid = current_fsuid();
         inode->i_gid = current_fsgid();
         set_nlink(inode, 1);
-        inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
+        inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
         HFS_I(inode)->flags = 0;
         HFS_I(inode)->rsrc_inode = NULL;
         HFS_I(inode)->fs_blocks = 0;