Merge remote-tracking branch 'origin/upstream-f2fs-stable-linux-4.4.y' into android-4.4

* origin/upstream-f2fs-stable-linux-4.4.y:
  Revert "f2fs: use timespec64 for inode timestamps"

Change-Id: I974d20fa9d637091d69d6f69a3db2d4cfe10a7a4
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index aea1bc1..a1e9753 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -747,8 +747,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,
@@ -2631,13 +2631,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 dd8f321..05193a1 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))