Commit fac02ddf authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Ilya Dryomov
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarIlya Dryomov <idryomov@gmail.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 9bbeab41

drivers/block/rbd.c

+1 −1
Original line number Diff line number Diff line
@@ -1466,7 +1466,7 @@ static void rbd_osd_req_format_write(struct rbd_obj_request *obj_request) 
	struct ceph_osd_request *osd_req = obj_request->osd_req;



	osd_req->r_flags = CEPH_OSD_FLAG_WRITE;

	ktime_get_real_ts(&osd_req->r_mtime);

	ktime_get_real_ts64(&osd_req->r_mtime);

	osd_req->r_data_offset = obj_request->ex.oe_off;

}

fs/ceph/addr.c

+5 −7
Original line number Diff line number Diff line
@@ -574,7 +574,6 @@ static u64 get_writepages_data_length(struct inode *inode, 
 */

static int writepage_nounlock(struct page *page, struct writeback_control *wbc)

{

	struct timespec ts;

	struct inode *inode;

	struct ceph_inode_info *ci;

	struct ceph_fs_client *fsc;
@@ -625,12 +624,11 @@ static int writepage_nounlock(struct page *page, struct writeback_control *wbc) 
		set_bdi_congested(inode_to_bdi(inode), BLK_RW_ASYNC);



	set_page_writeback(page);

	ts = timespec64_to_timespec(inode->i_mtime);

	err = ceph_osdc_writepages(&fsc->client->osdc, ceph_vino(inode),

				   &ci->i_layout, snapc, page_off, len,

				   ceph_wbc.truncate_seq,

				   ceph_wbc.truncate_size,

				   &ts, &page, 1);

				   &inode->i_mtime, &page, 1);

	if (err < 0) {

		struct writeback_control tmp_wbc;

		if (!wbc)
@@ -1134,7 +1132,7 @@ static int ceph_writepages_start(struct address_space *mapping, 
			pages = NULL;

		}



		req->r_mtime = timespec64_to_timespec(inode->i_mtime);

		req->r_mtime = inode->i_mtime;

		rc = ceph_osdc_start_request(&fsc->client->osdc, req, true);

		BUG_ON(rc);

		req = NULL;
@@ -1734,7 +1732,7 @@ int ceph_uninline_data(struct file *filp, struct page *locked_page) 
		goto out;

	}



	req->r_mtime = timespec64_to_timespec(inode->i_mtime);

	req->r_mtime = inode->i_mtime;

	err = ceph_osdc_start_request(&fsc->client->osdc, req, false);

	if (!err)

		err = ceph_osdc_wait_request(&fsc->client->osdc, req);
@@ -1776,7 +1774,7 @@ int ceph_uninline_data(struct file *filp, struct page *locked_page) 
			goto out_put;

	}



	req->r_mtime = timespec64_to_timespec(inode->i_mtime);

	req->r_mtime = inode->i_mtime;

	err = ceph_osdc_start_request(&fsc->client->osdc, req, false);

	if (!err)

		err = ceph_osdc_wait_request(&fsc->client->osdc, req);
@@ -1937,7 +1935,7 @@ static int __ceph_pool_perm_get(struct ceph_inode_info *ci, 
				     0, false, true);

	err = ceph_osdc_start_request(&fsc->client->osdc, rd_req, false);



	wr_req->r_mtime = timespec64_to_timespec(ci->vfs_inode.i_mtime);

	wr_req->r_mtime = ci->vfs_inode.i_mtime;

	err2 = ceph_osdc_start_request(&fsc->client->osdc, wr_req, false);



	if (!err)

fs/ceph/file.c

+4 −4
Original line number Diff line number Diff line
@@ -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);

include/linux/ceph/osd_client.h

+3 −3
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ struct ceph_osd_request { 
	/* set by submitter */

	u64 r_snapid;                         /* for reads, CEPH_NOSNAP o/w */

	struct ceph_snap_context *r_snapc;    /* for writes */

	struct timespec r_mtime;              /* ditto */

	struct timespec64 r_mtime;            /* ditto */

	u64 r_data_offset;                    /* ditto */

	bool r_linger;                        /* don't resend on failure */
@@ -253,7 +253,7 @@ struct ceph_osd_linger_request { 
	struct ceph_osd_request_target t;

	u32 map_dne_bound;



	struct timespec mtime;

	struct timespec64 mtime;



	struct kref kref;

	struct mutex lock;
@@ -508,7 +508,7 @@ extern int ceph_osdc_writepages(struct ceph_osd_client *osdc, 
				struct ceph_snap_context *sc,

				u64 off, u64 len,

				u32 truncate_seq, u64 truncate_size,

				struct timespec *mtime,

				struct timespec64 *mtime,

				struct page **pages, int nr_pages);



/* watch/notify */

net/ceph/osd_client.c

+4 −4
Original line number Diff line number Diff line
@@ -1978,7 +1978,7 @@ static void encode_request_partial(struct ceph_osd_request *req, 
	p += sizeof(struct ceph_blkin_trace_info);



	ceph_encode_32(&p, 0); /* client_inc, always 0 */

	ceph_encode_timespec(p, &req->r_mtime);

	ceph_encode_timespec64(p, &req->r_mtime);

	p += sizeof(struct ceph_timespec);



	encode_oloc(&p, end, &req->r_t.target_oloc);
@@ -4512,7 +4512,7 @@ ceph_osdc_watch(struct ceph_osd_client *osdc, 
	ceph_oid_copy(&lreq->t.base_oid, oid);

	ceph_oloc_copy(&lreq->t.base_oloc, oloc);

	lreq->t.flags = CEPH_OSD_FLAG_WRITE;

	ktime_get_real_ts(&lreq->mtime);

	ktime_get_real_ts64(&lreq->mtime);



	lreq->reg_req = alloc_linger_request(lreq);

	if (!lreq->reg_req) {
@@ -4570,7 +4570,7 @@ int ceph_osdc_unwatch(struct ceph_osd_client *osdc, 
	ceph_oid_copy(&req->r_base_oid, &lreq->t.base_oid);

	ceph_oloc_copy(&req->r_base_oloc, &lreq->t.base_oloc);

	req->r_flags = CEPH_OSD_FLAG_WRITE;

	ktime_get_real_ts(&req->r_mtime);

	ktime_get_real_ts64(&req->r_mtime);

	osd_req_op_watch_init(req, 0, lreq->linger_id,

			      CEPH_OSD_WATCH_OP_UNWATCH);
@@ -5136,7 +5136,7 @@ int ceph_osdc_writepages(struct ceph_osd_client *osdc, struct ceph_vino vino, 
			 struct ceph_snap_context *snapc,

			 u64 off, u64 len,

			 u32 truncate_seq, u64 truncate_size,

			 struct timespec *mtime,

			 struct timespec64 *mtime,

			 struct page **pages, int num_pages)

{

	struct ceph_osd_request *req;