diff options
Diffstat (limited to 'net/ceph/osd_client.c')
-rw-r--r-- | net/ceph/osd_client.c | 7 |
1 files changed, 4 insertions, 3 deletions
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) |