Revert "f2fs: use timespec64 for inode timestamps"

This reverts commit 98c7ff4c05a06cd81e432ee6b80d3c129cdfa19d.

This is to fix build errors for mips.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 1f7bfe4787aaf43ac472d55b6a08c52f398243ee..08f2389c52bee6d72d93b1e177dbb5b1e2bdd5f0 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -688,8 +688,8 @@ struct f2fs_inode_info {
        int i_extra_isize;              /* size of extra space located in i_addr */
        kprojid_t i_projid;             /* id for project quota */
        int i_inline_xattr_size;        /* inline xattr size */
-       struct timespec64 i_crtime;     /* inode creation time */
-       struct timespec64 i_disk_time[4];/* inode disk times */
+       struct timespec i_crtime;       /* inode creation time */
+       struct timespec i_disk_time[4]; /* inode disk times */
 };
 
 static inline void get_extent_info(struct extent_info *ext,
@@ -2572,13 +2572,13 @@ static inline bool f2fs_skip_inode_update(struct inode *inode, int dsync)
                        i_size_read(inode) & ~PAGE_MASK)
                return false;
 
-       if (!timespec64_equal(F2FS_I(inode)->i_disk_time, &inode->i_atime))
+       if (!timespec_equal(F2FS_I(inode)->i_disk_time, &inode->i_atime))
                return false;
-       if (!timespec64_equal(F2FS_I(inode)->i_disk_time + 1, &inode->i_ctime))
+       if (!timespec_equal(F2FS_I(inode)->i_disk_time + 1, &inode->i_ctime))
                return false;
-       if (!timespec64_equal(F2FS_I(inode)->i_disk_time + 2, &inode->i_mtime))
+       if (!timespec_equal(F2FS_I(inode)->i_disk_time + 2, &inode->i_mtime))
                return false;
-       if (!timespec64_equal(F2FS_I(inode)->i_disk_time + 3,
+       if (!timespec_equal(F2FS_I(inode)->i_disk_time + 3,
                                                &F2FS_I(inode)->i_crtime))
                return false;
 

diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
index ce2e6af3054be6d21864da5ffb020435a487257a..6ba092f635e3f648a34ea52cecc84ce6df1beee5 100644 (file)
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@ -50,8 +50,8 @@ static struct inode *f2fs_new_inode(struct inode *dir, umode_t mode)
 
        inode->i_ino = ino;
        inode->i_blocks = 0;
-       inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
-       F2FS_I(inode)->i_crtime = inode->i_mtime;
+       inode->i_mtime = inode->i_atime = inode->i_ctime =
+                       F2FS_I(inode)->i_crtime = current_time(inode);
        inode->i_generation = sbi->s_next_generation++;
 
        if (S_ISDIR(inode->i_mode))