btrfs: use timespec64 for i_otime

While the regular inode timestamps all use timespec64 now, the i_otime
field is btrfs specific and still needs to be converted to correctly
represent times beyond 2038.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h
index 7e075343daa508b7e7c0c6f8746ff2d2ff4a5653..1343ac57b438732446a150b96a2fde6d2a6863c6 100644 (file)
--- a/fs/btrfs/btrfs_inode.h
+++ b/fs/btrfs/btrfs_inode.h
@@ -178,7 +178,7 @@ struct btrfs_inode {
        struct btrfs_delayed_node *delayed_node;
 
        /* File creation time. */
-       struct timespec i_otime;
+       struct timespec64 i_otime;
 
        /* Hook into fs_info->delayed_iputs */
        struct list_head delayed_iput;

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 1ade43c02b81102d08b229d12fb0566874026778..2858bc35592023db86583a51c12bc7acd1c453df 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -5744,7 +5744,7 @@ static struct inode *new_simple_dir(struct super_block *s,
        inode->i_mtime = current_time(inode);
        inode->i_atime = inode->i_mtime;
        inode->i_ctime = inode->i_mtime;
-       BTRFS_I(inode)->i_otime = timespec64_to_timespec(inode->i_mtime);
+       BTRFS_I(inode)->i_otime = inode->i_mtime;
 
        return inode;
 }
@@ -6348,7 +6348,7 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans,
        inode->i_mtime = current_time(inode);
        inode->i_atime = inode->i_mtime;
        inode->i_ctime = inode->i_mtime;
-       BTRFS_I(inode)->i_otime = timespec64_to_timespec(inode->i_mtime);
+       BTRFS_I(inode)->i_otime = inode->i_mtime;
 
        inode_item = btrfs_item_ptr(path->nodes[0], path->slots[0],
                                  struct btrfs_inode_item);