ceph: use timespec64 for r_stamp (0ed1e90a) · Commits · 戴 / test

fs/ceph/inode.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2136,7 +2136,7 @@ int __ceph_setattr(struct inode inode, struct iattr attr)
		req->r_inode_drop = release;
		req->r_args.setattr.mask = cpu_to_le32(mask);
		req->r_num_caps = 1;
		req->r_stamp = timespec64_to_timespec(attr->ia_ctime);
		req->r_stamp = attr->ia_ctime;
		err = ceph_mdsc_do_request(mdsc, NULL, req);
		}
		dout("setattr %p result=%d (%s locally, %d remote)\n", inode, err,

+3 −4

Original line number	Diff line number	Diff line
		@@ -1799,8 +1799,7 @@ ceph_mdsc_create_request(struct ceph_mds_client *mdsc, int op, int mode)
		INIT_LIST_HEAD(&req->r_unsafe_item);

		ktime_get_coarse_real_ts64(&ts);
		req->r_stamp = timespec64_to_timespec(timespec64_trunc(ts,
		mdsc->fsc->sb->s_time_gran));
		req->r_stamp = timespec64_trunc(ts, mdsc->fsc->sb->s_time_gran);

		req->r_op = op;
		req->r_direct_mode = mode;
		@@ -2097,7 +2096,7 @@ static struct ceph_msg create_request_message(struct ceph_mds_client mdsc,
		/* time stamp */
		{
		struct ceph_timespec ts;
		ceph_encode_timespec(&ts, &req->r_stamp);
		ceph_encode_timespec64(&ts, &req->r_stamp);
		ceph_encode_copy(&p, &ts, sizeof(ts));
		}

		@@ -2190,7 +2189,7 @@ static int __prepare_send_request(struct ceph_mds_client *mdsc,
		p = msg->front.iov_base + req->r_request_release_offset;
		{
		struct ceph_timespec ts;
		ceph_encode_timespec(&ts, &req->r_stamp);
		ceph_encode_timespec64(&ts, &req->r_stamp);
		ceph_encode_copy(&p, &ts, sizeof(ts));
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -229,7 +229,7 @@ struct ceph_mds_request {
		int r_fmode; /* file mode, if expecting cap */
		kuid_t r_uid;
		kgid_t r_gid;
		struct timespec r_stamp;
		struct timespec64 r_stamp;

		/* for choosing which mds to send this request to */
		int r_direct_mode;