ext4: convert to new timestamp accessors

[linux-2.6-microblaze.git] / fs / ext4 / ioctl.c

diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index 0bfe2ce..4f931f8 100644 (file)
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -312,13 +312,22 @@ static void swap_inode_data(struct inode *inode1, struct inode *inode2)
        struct ext4_inode_info *ei1;
        struct ext4_inode_info *ei2;
        unsigned long tmp;
+       struct timespec64 ts1, ts2;
 
        ei1 = EXT4_I(inode1);
        ei2 = EXT4_I(inode2);
 
        swap(inode1->i_version, inode2->i_version);
-       swap(inode1->i_atime, inode2->i_atime);
-       swap(inode1->i_mtime, inode2->i_mtime);
+
+       ts1 = inode_get_atime(inode1);
+       ts2 = inode_get_atime(inode2);
+       inode_set_atime_to_ts(inode1, ts2);
+       inode_set_atime_to_ts(inode2, ts1);
+
+       ts1 = inode_get_mtime(inode1);
+       ts2 = inode_get_mtime(inode2);
+       inode_set_mtime_to_ts(inode1, ts2);
+       inode_set_mtime_to_ts(inode2, ts1);
 
        memswap(ei1->i_data, ei2->i_data, sizeof(ei1->i_data));
        tmp = ei1->i_flags & EXT4_FL_SHOULD_SWAP;