aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/ceph
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2018-07-13 16:18:37 -0400
committerIlya Dryomov <idryomov@gmail.com>2018-08-02 15:33:14 -0400
commitfac02ddf910814c24f5d9d969dfdab5227f6f3eb (patch)
tree1725d192db8d99bbc738b5d1ed576df07eac8276 /include/linux/ceph
parent9bbeab41ce50542624ef381e7852d70f2f39a2b1 (diff)
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>
Diffstat (limited to 'include/linux/ceph')
-rw-r--r--include/linux/ceph/osd_client.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
index d6fe7e4df8cf..02096da01845 100644
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
@@ -199,7 +199,7 @@ struct ceph_osd_request {
199 /* set by submitter */ 199 /* set by submitter */
200 u64 r_snapid; /* for reads, CEPH_NOSNAP o/w */ 200 u64 r_snapid; /* for reads, CEPH_NOSNAP o/w */
201 struct ceph_snap_context *r_snapc; /* for writes */ 201 struct ceph_snap_context *r_snapc; /* for writes */
202 struct timespec r_mtime; /* ditto */ 202 struct timespec64 r_mtime; /* ditto */
203 u64 r_data_offset; /* ditto */ 203 u64 r_data_offset; /* ditto */
204 bool r_linger; /* don't resend on failure */ 204 bool r_linger; /* don't resend on failure */
205 205
@@ -253,7 +253,7 @@ struct ceph_osd_linger_request {
253 struct ceph_osd_request_target t; 253 struct ceph_osd_request_target t;
254 u32 map_dne_bound; 254 u32 map_dne_bound;
255 255
256 struct timespec mtime; 256 struct timespec64 mtime;
257 257
258 struct kref kref; 258 struct kref kref;
259 struct mutex lock; 259 struct mutex lock;
@@ -508,7 +508,7 @@ extern int ceph_osdc_writepages(struct ceph_osd_client *osdc,
508 struct ceph_snap_context *sc, 508 struct ceph_snap_context *sc,
509 u64 off, u64 len, 509 u64 off, u64 len,
510 u32 truncate_seq, u64 truncate_size, 510 u32 truncate_seq, u64 truncate_size,
511 struct timespec *mtime, 511 struct timespec64 *mtime,
512 struct page **pages, int nr_pages); 512 struct page **pages, int nr_pages);
513 513
514/* watch/notify */ 514/* watch/notify */