aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2013-03-01 19:00:14 -0500
committerSage Weil <sage@inktank.com>2013-05-02 00:16:19 -0400
commit53ded495c6ac9f79d9a7f91bac92ba977944306c (patch)
tree5ba298a77c6b8ca0678fd53fd1c087f7e3d43581 /fs
parent1d866d1c31110db177cbd0636b95c4cb32ca2c6e (diff)
libceph: define mds_alloc_msg() method
The only user of the ceph messenger that doesn't define an alloc_msg method is the mds client. Define one, such that it works just like it did before, and simplify ceph_con_in_msg_alloc() by assuming the alloc_msg method is always present. This and the next patch resolve: http://tracker.ceph.com/issues/4322 Signed-off-by: Alex Elder <elder@inktank.com> Reviewed-by: Greg Farnum <greg@inktank.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/ceph/mds_client.c23
1 files changed, 23 insertions, 0 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 4efbc63e0bb6..b87b24fed4b2 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -3473,6 +3473,28 @@ static int invalidate_authorizer(struct ceph_connection *con)
3473 return ceph_monc_validate_auth(&mdsc->fsc->client->monc); 3473 return ceph_monc_validate_auth(&mdsc->fsc->client->monc);
3474} 3474}
3475 3475
3476static struct ceph_msg *mds_alloc_msg(struct ceph_connection *con,
3477 struct ceph_msg_header *hdr, int *skip)
3478{
3479 struct ceph_msg *msg;
3480 int type = (int) le16_to_cpu(hdr->type);
3481 int front_len = (int) le32_to_cpu(hdr->front_len);
3482
3483 if (con->in_msg)
3484 return con->in_msg;
3485
3486 *skip = 0;
3487 msg = ceph_msg_new(type, front_len, GFP_NOFS, false);
3488 if (!msg) {
3489 pr_err("unable to allocate msg type %d len %d\n",
3490 type, front_len);
3491 return NULL;
3492 }
3493 msg->page_alignment = (unsigned int) le16_to_cpu(hdr->data_off);
3494
3495 return msg;
3496}
3497
3476static const struct ceph_connection_operations mds_con_ops = { 3498static const struct ceph_connection_operations mds_con_ops = {
3477 .get = con_get, 3499 .get = con_get,
3478 .put = con_put, 3500 .put = con_put,
@@ -3481,6 +3503,7 @@ static const struct ceph_connection_operations mds_con_ops = {
3481 .verify_authorizer_reply = verify_authorizer_reply, 3503 .verify_authorizer_reply = verify_authorizer_reply,
3482 .invalidate_authorizer = invalidate_authorizer, 3504 .invalidate_authorizer = invalidate_authorizer,
3483 .peer_reset = peer_reset, 3505 .peer_reset = peer_reset,
3506 .alloc_msg = mds_alloc_msg,
3484}; 3507};
3485 3508
3486/* eof */ 3509/* eof */