diff options
-rw-r--r-- | include/linux/ceph/msgpool.h | 3 | ||||
-rw-r--r-- | net/ceph/msgpool.c | 7 | ||||
-rw-r--r-- | net/ceph/osd_client.c | 7 |
3 files changed, 10 insertions, 7 deletions
diff --git a/include/linux/ceph/msgpool.h b/include/linux/ceph/msgpool.h index a362605f9368..09fa96b43436 100644 --- a/include/linux/ceph/msgpool.h +++ b/include/linux/ceph/msgpool.h | |||
@@ -11,10 +11,11 @@ | |||
11 | struct ceph_msgpool { | 11 | struct ceph_msgpool { |
12 | const char *name; | 12 | const char *name; |
13 | mempool_t *pool; | 13 | mempool_t *pool; |
14 | int type; /* preallocated message type */ | ||
14 | int front_len; /* preallocated payload size */ | 15 | int front_len; /* preallocated payload size */ |
15 | }; | 16 | }; |
16 | 17 | ||
17 | extern int ceph_msgpool_init(struct ceph_msgpool *pool, | 18 | extern int ceph_msgpool_init(struct ceph_msgpool *pool, int type, |
18 | int front_len, int size, bool blocking, | 19 | int front_len, int size, bool blocking, |
19 | const char *name); | 20 | const char *name); |
20 | extern void ceph_msgpool_destroy(struct ceph_msgpool *pool); | 21 | extern void ceph_msgpool_destroy(struct ceph_msgpool *pool); |
diff --git a/net/ceph/msgpool.c b/net/ceph/msgpool.c index 11d5f4196a73..ddec1c10ac80 100644 --- a/net/ceph/msgpool.c +++ b/net/ceph/msgpool.c | |||
@@ -12,7 +12,7 @@ static void *msgpool_alloc(gfp_t gfp_mask, void *arg) | |||
12 | struct ceph_msgpool *pool = arg; | 12 | struct ceph_msgpool *pool = arg; |
13 | struct ceph_msg *msg; | 13 | struct ceph_msg *msg; |
14 | 14 | ||
15 | msg = ceph_msg_new(0, pool->front_len, gfp_mask, true); | 15 | msg = ceph_msg_new(pool->type, pool->front_len, gfp_mask, true); |
16 | if (!msg) { | 16 | if (!msg) { |
17 | dout("msgpool_alloc %s failed\n", pool->name); | 17 | dout("msgpool_alloc %s failed\n", pool->name); |
18 | } else { | 18 | } else { |
@@ -32,10 +32,11 @@ static void msgpool_free(void *element, void *arg) | |||
32 | ceph_msg_put(msg); | 32 | ceph_msg_put(msg); |
33 | } | 33 | } |
34 | 34 | ||
35 | int ceph_msgpool_init(struct ceph_msgpool *pool, | 35 | int ceph_msgpool_init(struct ceph_msgpool *pool, int type, |
36 | int front_len, int size, bool blocking, const char *name) | 36 | int front_len, int size, bool blocking, const char *name) |
37 | { | 37 | { |
38 | dout("msgpool %s init\n", name); | 38 | dout("msgpool %s init\n", name); |
39 | pool->type = type; | ||
39 | pool->front_len = front_len; | 40 | pool->front_len = front_len; |
40 | pool->pool = mempool_create(size, msgpool_alloc, msgpool_free, pool); | 41 | pool->pool = mempool_create(size, msgpool_alloc, msgpool_free, pool); |
41 | if (!pool->pool) | 42 | if (!pool->pool) |
@@ -61,7 +62,7 @@ struct ceph_msg *ceph_msgpool_get(struct ceph_msgpool *pool, | |||
61 | WARN_ON(1); | 62 | WARN_ON(1); |
62 | 63 | ||
63 | /* try to alloc a fresh message */ | 64 | /* try to alloc a fresh message */ |
64 | return ceph_msg_new(0, front_len, GFP_NOFS, false); | 65 | return ceph_msg_new(pool->type, front_len, GFP_NOFS, false); |
65 | } | 66 | } |
66 | 67 | ||
67 | msg = mempool_alloc(pool->pool, GFP_NOFS); | 68 | msg = mempool_alloc(pool->pool, GFP_NOFS); |
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index c2527113d2ae..4475d17863ee 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c | |||
@@ -242,6 +242,7 @@ struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *osdc, | |||
242 | } | 242 | } |
243 | ceph_pagelist_init(req->r_trail); | 243 | ceph_pagelist_init(req->r_trail); |
244 | } | 244 | } |
245 | |||
245 | /* create request message; allow space for oid */ | 246 | /* create request message; allow space for oid */ |
246 | msg_size += MAX_OBJ_NAME_SIZE; | 247 | msg_size += MAX_OBJ_NAME_SIZE; |
247 | if (snapc) | 248 | if (snapc) |
@@ -255,7 +256,6 @@ struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *osdc, | |||
255 | return NULL; | 256 | return NULL; |
256 | } | 257 | } |
257 | 258 | ||
258 | msg->hdr.type = cpu_to_le16(CEPH_MSG_OSD_OP); | ||
259 | memset(msg->front.iov_base, 0, msg->front.iov_len); | 259 | memset(msg->front.iov_base, 0, msg->front.iov_len); |
260 | 260 | ||
261 | req->r_request = msg; | 261 | req->r_request = msg; |
@@ -1837,11 +1837,12 @@ int ceph_osdc_init(struct ceph_osd_client *osdc, struct ceph_client *client) | |||
1837 | if (!osdc->req_mempool) | 1837 | if (!osdc->req_mempool) |
1838 | goto out; | 1838 | goto out; |
1839 | 1839 | ||
1840 | err = ceph_msgpool_init(&osdc->msgpool_op, OSD_OP_FRONT_LEN, 10, true, | 1840 | err = ceph_msgpool_init(&osdc->msgpool_op, CEPH_MSG_OSD_OP, |
1841 | OSD_OP_FRONT_LEN, 10, true, | ||
1841 | "osd_op"); | 1842 | "osd_op"); |
1842 | if (err < 0) | 1843 | if (err < 0) |
1843 | goto out_mempool; | 1844 | goto out_mempool; |
1844 | err = ceph_msgpool_init(&osdc->msgpool_op_reply, | 1845 | err = ceph_msgpool_init(&osdc->msgpool_op_reply, CEPH_MSG_OSD_OPREPLY, |
1845 | OSD_OPREPLY_FRONT_LEN, 10, true, | 1846 | OSD_OPREPLY_FRONT_LEN, 10, true, |
1846 | "osd_op_reply"); | 1847 | "osd_op_reply"); |
1847 | if (err < 0) | 1848 | if (err < 0) |