Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa26d662 authored by Jeff Layton's avatar Jeff Layton Committed by Ilya Dryomov
Browse files

libceph: remove req->r_replay_version 



Nothing uses this anymore with the removal of the ack vs. commit code.
Remove the field and just encode zeroes into place in the request
encoding.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Reviewed-by: default avatarIlya Dryomov <idryomov@gmail.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 79162547

include/linux/ceph/osd_client.h

+0 −1
Original line number Diff line number Diff line
@@ -192,7 +192,6 @@ struct ceph_osd_request { 
	unsigned long r_stamp;                /* jiffies, send or check time */

	unsigned long r_start_stamp;          /* jiffies */

	int r_attempts;

	struct ceph_eversion r_replay_version; /* aka reassert_version */

	u32 r_last_force_resend;

	u32 r_map_dne_bound;

net/ceph/debugfs.c

+1 −3
Original line number Diff line number Diff line
@@ -177,9 +177,7 @@ static void dump_request(struct seq_file *s, struct ceph_osd_request *req) 
	seq_printf(s, "%llu\t", req->r_tid);

	dump_target(s, &req->r_t);



	seq_printf(s, "\t%d\t%u'%llu", req->r_attempts,

		   le32_to_cpu(req->r_replay_version.epoch),

		   le64_to_cpu(req->r_replay_version.version));

	seq_printf(s, "\t%d", req->r_attempts);



	for (i = 0; i < req->r_num_ops; i++) {

		struct ceph_osd_req_op *op = &req->r_ops[i];

net/ceph/osd_client.c

+4 −3
Original line number Diff line number Diff line
@@ -1503,9 +1503,10 @@ static void encode_request(struct ceph_osd_request *req, struct ceph_msg *msg) 
	ceph_encode_32(&p, req->r_flags);

	ceph_encode_timespec(p, &req->r_mtime);

	p += sizeof(struct ceph_timespec);

	/* aka reassert_version */

	memcpy(p, &req->r_replay_version, sizeof(req->r_replay_version));

	p += sizeof(req->r_replay_version);



	/* reassert_version */

	memset(p, 0, sizeof(struct ceph_eversion));

	p += sizeof(struct ceph_eversion);



	/* oloc */

	ceph_start_encoding(&p, 5, 4,