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

Commit 7665d85b authored by Yan, Zheng's avatar Yan, Zheng Committed by Ilya Dryomov
Browse files

libceph: move r_reply_op_{len,result} into struct ceph_osd_req_op 



This avoids defining large array of r_reply_op_{len,result} in
in struct ceph_osd_request.

Signed-off-by: default avatarYan, Zheng <zyan@redhat.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent de2aa102

drivers/block/rbd.c

+1 −1
Original line number Diff line number Diff line
@@ -1854,7 +1854,7 @@ static void rbd_osd_req_callback(struct ceph_osd_request *osd_req, 
	 * passed to the block layer, which just supports a 32-bit

	 * length field.

	 */

	obj_request->xferred = osd_req->r_reply_op_len[0];

	obj_request->xferred = osd_req->r_ops[0].outdata_len;

	rbd_assert(obj_request->xferred < (u64)UINT_MAX);



	opcode = osd_req->r_ops[0].op;

include/linux/ceph/osd_client.h

+3 −2
Original line number Diff line number Diff line
@@ -78,6 +78,9 @@ struct ceph_osd_req_op { 
	u16 op;           /* CEPH_OSD_OP_* */

	u32 flags;        /* CEPH_OSD_OP_FLAG_* */

	u32 indata_len;   /* request */

	u32 outdata_len;  /* reply */

	s32 rval;



	union {

		struct ceph_osd_data raw_data_in;

		struct {
@@ -148,8 +151,6 @@ struct ceph_osd_request { 
	struct ceph_eversion *r_request_reassert_version;



	int               r_result;

	int               r_reply_op_len[CEPH_OSD_MAX_OP];

	s32               r_reply_op_result[CEPH_OSD_MAX_OP];

	int               r_got_reply;

	int		  r_linger;

net/ceph/osd_client.c

+2 −2
Original line number Diff line number Diff line
@@ -1821,7 +1821,7 @@ static void handle_reply(struct ceph_osd_client *osdc, struct ceph_msg *msg) 
		int len;



		len = le32_to_cpu(op->payload_len);

		req->r_reply_op_len[i] = len;

		req->r_ops[i].outdata_len = len;

		dout(" op %d has %d bytes\n", i, len);

		payload_len += len;

		p += sizeof(*op);
@@ -1836,7 +1836,7 @@ static void handle_reply(struct ceph_osd_client *osdc, struct ceph_msg *msg) 
	ceph_decode_need(&p, end, 4 + numops * 4, bad_put);

	retry_attempt = ceph_decode_32(&p);

	for (i = 0; i < numops; i++)

		req->r_reply_op_result[i] = ceph_decode_32(&p);

		req->r_ops[i].rval = ceph_decode_32(&p);



	if (le16_to_cpu(msg->hdr.version) >= 6) {

		p += 8 + 4; /* skip replay_version */