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

Commit ae458f5a authored by Ilya Dryomov's avatar Ilya Dryomov
Browse files

libceph: make r_request msg_size calculation clearer 



Although msg_size is calculated correctly, the terms are grouped in
a misleading way - snaps appears to not have room for a u32 length.
Move calculation closer to its use and regroup terms.

No functional change.

Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 7665d85b

net/ceph/osd_client.c

+11 −10
Original line number Diff line number Diff line
@@ -372,16 +372,6 @@ struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *osdc, 
	BUILD_BUG_ON(CEPH_OSD_MAX_OP > U16_MAX);

	BUG_ON(num_ops > CEPH_OSD_MAX_OP);



	msg_size = 4 + 4 + 8 + 8 + 4+8;

	msg_size += 2 + 4 + 8 + 4 + 4; /* oloc */

	msg_size += 1 + 8 + 4 + 4;     /* pg_t */

	msg_size += 4 + CEPH_MAX_OID_NAME_LEN; /* oid */

	msg_size += 2 + num_ops*sizeof(struct ceph_osd_op);

	msg_size += 8;  /* snapid */

	msg_size += 8;  /* snap_seq */

	msg_size += 8 * (snapc ? snapc->num_snaps : 0);  /* snaps */

	msg_size += 4;



	if (use_mempool) {

		req = mempool_alloc(osdc->req_mempool, gfp_flags);

		memset(req, 0, sizeof(*req));
@@ -420,6 +410,17 @@ struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *osdc, 
	}

	req->r_reply = msg;



	msg_size = 4 + 4 + 4; /* client_inc, osdmap_epoch, flags */

	msg_size += 4 + 4 + 4 + 8; /* mtime, reassert_version */

	msg_size += 2 + 4 + 8 + 4 + 4; /* oloc */

	msg_size += 1 + 8 + 4 + 4; /* pgid */

	msg_size += 4 + CEPH_MAX_OID_NAME_LEN; /* oid */

	msg_size += 2 + num_ops * sizeof(struct ceph_osd_op);

	msg_size += 8; /* snapid */

	msg_size += 8; /* snap_seq */

	msg_size += 4 + 8 * (snapc ? snapc->num_snaps : 0); /* snaps */

	msg_size += 4; /* retry_attempt */



	/* create request message; allow space for oid */

	if (use_mempool)

		msg = ceph_msgpool_get(&osdc->msgpool_op, 0);