Merge tag 'v5.6-rc1' into arm/fixes

[linux.git] / fs / cifs / fscache.c

diff --git a/fs/cifs/fscache.c b/fs/cifs/fscache.c
index 85145a7630216b0941d71d8cc5b9bb8d6f409af1..ea6ace9c2417dd954047799e691a7759cd2c5471 100644 (file)
--- a/fs/cifs/fscache.c
+++ b/fs/cifs/fscache.c
@@ -129,8 +129,10 @@ static void cifs_fscache_acquire_inode_cookie(struct cifsInodeInfo *cifsi,
 
        memset(&auxdata, 0, sizeof(auxdata));
        auxdata.eof = cifsi->server_eof;
-       auxdata.last_write_time = timespec64_to_timespec(cifsi->vfs_inode.i_mtime);
-       auxdata.last_change_time = timespec64_to_timespec(cifsi->vfs_inode.i_ctime);
+       auxdata.last_write_time_sec = cifsi->vfs_inode.i_mtime.tv_sec;
+       auxdata.last_change_time_sec = cifsi->vfs_inode.i_ctime.tv_sec;
+       auxdata.last_write_time_nsec = cifsi->vfs_inode.i_mtime.tv_nsec;
+       auxdata.last_change_time_nsec = cifsi->vfs_inode.i_ctime.tv_nsec;
 
        cifsi->fscache =
                fscache_acquire_cookie(tcon->fscache,
@@ -166,8 +168,10 @@ void cifs_fscache_release_inode_cookie(struct inode *inode)
        if (cifsi->fscache) {
                memset(&auxdata, 0, sizeof(auxdata));
                auxdata.eof = cifsi->server_eof;
-               auxdata.last_write_time = timespec64_to_timespec(cifsi->vfs_inode.i_mtime);
-               auxdata.last_change_time = timespec64_to_timespec(cifsi->vfs_inode.i_ctime);
+               auxdata.last_write_time_sec = cifsi->vfs_inode.i_mtime.tv_sec;
+               auxdata.last_change_time_sec = cifsi->vfs_inode.i_ctime.tv_sec;
+               auxdata.last_write_time_nsec = cifsi->vfs_inode.i_mtime.tv_nsec;
+               auxdata.last_change_time_nsec = cifsi->vfs_inode.i_ctime.tv_nsec;
 
                cifs_dbg(FYI, "%s: (0x%p)\n", __func__, cifsi->fscache);
                fscache_relinquish_cookie(cifsi->fscache, &auxdata, false);