libceph: use timespec64 for r_mtime

The request mtime field is used all over ceph, and is currently
represented as a 'timespec' structure in Linux. This changes it to
timespec64 to allow times beyond 2038, modifying all users at the
same time.

[ Remove now redundant ts variable in writepage_nounlock(). ]

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index ad0bed99b1d5..2f3a30ca94bf 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -721,7 +721,7 @@ struct ceph_aio_request {
         struct list_head osd_reqs;
         unsigned num_reqs;
         atomic_t pending_reqs;
-        struct timespec mtime;
+        struct timespec64 mtime;
         struct ceph_cap_flush *prealloc_cf;
 };
 
@@ -923,7 +923,7 @@ ceph_direct_read_write(struct kiocb *iocb, struct iov_iter *iter,
         int num_pages = 0;
         int flags;
         int ret;
-        struct timespec mtime = timespec64_to_timespec(current_time(inode));
+        struct timespec64 mtime = current_time(inode);
         size_t count = iov_iter_count(iter);
         loff_t pos = iocb->ki_pos;
         bool write = iov_iter_rw(iter) == WRITE;
@@ -1131,7 +1131,7 @@ ceph_sync_write(struct kiocb *iocb, struct iov_iter *from, loff_t pos,
         int flags;
         int ret;
         bool check_caps = false;
-        struct timespec mtime = timespec64_to_timespec(current_time(inode));
+        struct timespec64 mtime = current_time(inode);
         size_t count = iov_iter_count(from);
 
         if (ceph_snap(file_inode(file)) != CEPH_NOSNAP)
@@ -1663,7 +1663,7 @@ static int ceph_zero_partial_object(struct inode *inode,
                 goto out;
         }
 
-        req->r_mtime = timespec64_to_timespec(inode->i_mtime);
+        req->r_mtime = inode->i_mtime;
         ret = ceph_osdc_start_request(&fsc->client->osdc, req, false);
         if (!ret) {
                 ret = ceph_osdc_wait_request(&fsc->client->osdc, req);