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

Commit d50b409f authored by Sage Weil's avatar Sage Weil
Browse files

libceph: initialize msgpool message types 



Initialize the type field for messages in a msgpool.  The caller was doing
this for osd ops, but not for the reply messages.

Reported-by: default avatarAlex Elder <elder@inktank.com>
Signed-off-by: default avatarSage Weil <sage@inktank.com>
parent fbb85a47

include/linux/ceph/msgpool.h

+2 −1
Original line number Diff line number Diff line
@@ -11,10 +11,11 @@ 
struct ceph_msgpool {

	const char *name;

	mempool_t *pool;

	int type;               /* preallocated message type */

	int front_len;          /* preallocated payload size */

};



extern int ceph_msgpool_init(struct ceph_msgpool *pool,

extern int ceph_msgpool_init(struct ceph_msgpool *pool, int type,

			     int front_len, int size, bool blocking,

			     const char *name);

extern void ceph_msgpool_destroy(struct ceph_msgpool *pool);

net/ceph/msgpool.c

+4 −3
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ static void *msgpool_alloc(gfp_t gfp_mask, void *arg) 
	struct ceph_msgpool *pool = arg;

	struct ceph_msg *msg;



	msg = ceph_msg_new(0, pool->front_len, gfp_mask, true);

	msg = ceph_msg_new(pool->type, pool->front_len, gfp_mask, true);

	if (!msg) {

		dout("msgpool_alloc %s failed\n", pool->name);

	} else {
@@ -32,10 +32,11 @@ static void msgpool_free(void *element, void *arg) 
	ceph_msg_put(msg);

}



int ceph_msgpool_init(struct ceph_msgpool *pool,

int ceph_msgpool_init(struct ceph_msgpool *pool, int type,

		      int front_len, int size, bool blocking, const char *name)

{

	dout("msgpool %s init\n", name);

	pool->type = type;

	pool->front_len = front_len;

	pool->pool = mempool_create(size, msgpool_alloc, msgpool_free, pool);

	if (!pool->pool)
@@ -61,7 +62,7 @@ struct ceph_msg *ceph_msgpool_get(struct ceph_msgpool *pool, 
		WARN_ON(1);



		/* try to alloc a fresh message */

		return ceph_msg_new(0, front_len, GFP_NOFS, false);

		return ceph_msg_new(pool->type, front_len, GFP_NOFS, false);

	}



	msg = mempool_alloc(pool->pool, GFP_NOFS);

net/ceph/osd_client.c

+4 −3
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *osdc, 
		}

		ceph_pagelist_init(req->r_trail);

	}



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

	msg_size += MAX_OBJ_NAME_SIZE;

	if (snapc)
@@ -255,7 +256,6 @@ struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *osdc, 
		return NULL;

	}



	msg->hdr.type = cpu_to_le16(CEPH_MSG_OSD_OP);

	memset(msg->front.iov_base, 0, msg->front.iov_len);



	req->r_request = msg;
@@ -1837,11 +1837,12 @@ int ceph_osdc_init(struct ceph_osd_client *osdc, struct ceph_client *client) 
	if (!osdc->req_mempool)

		goto out;



	err = ceph_msgpool_init(&osdc->msgpool_op, OSD_OP_FRONT_LEN, 10, true,

	err = ceph_msgpool_init(&osdc->msgpool_op, CEPH_MSG_OSD_OP,

				OSD_OP_FRONT_LEN, 10, true,

				"osd_op");

	if (err < 0)

		goto out_mempool;

	err = ceph_msgpool_init(&osdc->msgpool_op_reply,

	err = ceph_msgpool_init(&osdc->msgpool_op_reply, CEPH_MSG_OSD_OPREPLY,

				OSD_OPREPLY_FRONT_LEN, 10, true,

				"osd_op_reply");

	if (err < 0)