1 files changed, 13 insertions, 9 deletions

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 49035c5a2c4..b83f91edebd 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -726,7 +726,7 @@ static int ext4_splice_branch(handle_t *handle, struct inode *inode,
 
         /* We are done with atomic stuff, now do the rest of housekeeping */
 
-        inode->i_ctime = CURRENT_TIME_SEC;
+        inode->i_ctime = ext4_current_time(inode);
         ext4_mark_inode_dirty(handle, inode);
 
         /* had we spliced it onto indirect block? */
@@ -2375,7 +2375,7 @@ do_indirects:
         ext4_discard_reservation(inode);
 
         mutex_unlock(&ei->truncate_mutex);
-        inode->i_mtime = inode->i_ctime = CURRENT_TIME_SEC;
+        inode->i_mtime = inode->i_ctime = ext4_current_time(inode);
         ext4_mark_inode_dirty(handle, inode);
 
         /*
@@ -2629,10 +2629,6 @@ void ext4_read_inode(struct inode * inode)
         }
         inode->i_nlink = le16_to_cpu(raw_inode->i_links_count);
         inode->i_size = le32_to_cpu(raw_inode->i_size);
-        inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime);
-        inode->i_ctime.tv_sec = (signed)le32_to_cpu(raw_inode->i_ctime);
-        inode->i_mtime.tv_sec = (signed)le32_to_cpu(raw_inode->i_mtime);
-        inode->i_atime.tv_nsec = inode->i_ctime.tv_nsec = inode->i_mtime.tv_nsec = 0;
 
         ei->i_state = 0;
         ei->i_dir_start_lookup = 0;
@@ -2710,6 +2706,11 @@ void ext4_read_inode(struct inode * inode)
         } else
                 ei->i_extra_isize = 0;
 
+        EXT4_INODE_GET_XTIME(i_ctime, inode, raw_inode);
+        EXT4_INODE_GET_XTIME(i_mtime, inode, raw_inode);
+        EXT4_INODE_GET_XTIME(i_atime, inode, raw_inode);
+        EXT4_EINODE_GET_XTIME(i_crtime, ei, raw_inode);
+
         if (S_ISREG(inode->i_mode)) {
                 inode->i_op = &ext4_file_inode_operations;
                 inode->i_fop = &ext4_file_operations;
@@ -2791,9 +2792,12 @@ static int ext4_do_update_inode(handle_t *handle,
         }
         raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
         raw_inode->i_size = cpu_to_le32(ei->i_disksize);
-        raw_inode->i_atime = cpu_to_le32(inode->i_atime.tv_sec);
-        raw_inode->i_ctime = cpu_to_le32(inode->i_ctime.tv_sec);
-        raw_inode->i_mtime = cpu_to_le32(inode->i_mtime.tv_sec);
+
+        EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode);
+        EXT4_INODE_SET_XTIME(i_mtime, inode, raw_inode);
+        EXT4_INODE_SET_XTIME(i_atime, inode, raw_inode);
+        EXT4_EINODE_SET_XTIME(i_crtime, ei, raw_inode);
+
         raw_inode->i_blocks = cpu_to_le32(inode->i_blocks);
         raw_inode->i_dtime = cpu_to_le32(ei->i_dtime);
         raw_inode->i_flags = cpu_to_le32(ei->i_flags);