luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libceph: define mds_alloc_msg() method

Browse Source 
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>
This commit is contained in:
Alex Elder 2013-03-01 18:00:14 -06:00 committed by Sage Weil
parent 1d866d1c31
commit 53ded495c6
2 changed files with 42 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fs/ceph/mds_client.c
View File

@ -3473,6 +3473,28 @@ static int invalidate_authorizer(struct ceph_connection *con)
return ceph_monc_validate_auth(&mdsc->fsc->client->monc); return ceph_monc_validate_auth(&mdsc->fsc->client->monc);
} }
static struct ceph_msg *mds_alloc_msg(struct ceph_connection *con,
struct ceph_msg_header *hdr, int *skip)
{
struct ceph_msg *msg;
int type = (int) le16_to_cpu(hdr->type);
int front_len = (int) le32_to_cpu(hdr->front_len);
if (con->in_msg)
return con->in_msg;
*skip = 0;
msg = ceph_msg_new(type, front_len, GFP_NOFS, false);
if (!msg) {
pr_err("unable to allocate msg type %d len %d\n",
type, front_len);
return NULL;
}
msg->page_alignment = (unsigned int) le16_to_cpu(hdr->data_off);
return msg;
}
static const struct ceph_connection_operations mds_con_ops = { static const struct ceph_connection_operations mds_con_ops = {
.get = con_get, .get = con_get,
.put = con_put, .put = con_put,
@ -3481,6 +3503,7 @@ static const struct ceph_connection_operations mds_con_ops = {
.verify_authorizer_reply = verify_authorizer_reply, .verify_authorizer_reply = verify_authorizer_reply,
.invalidate_authorizer = invalidate_authorizer, .invalidate_authorizer = invalidate_authorizer,
.peer_reset = peer_reset, .peer_reset = peer_reset,
.alloc_msg = mds_alloc_msg,
}; };
/* eof */ /* eof */

59
net/ceph/messenger.c
View File

@ -2804,55 +2804,34 @@ static int ceph_alloc_middle(struct ceph_connection *con, struct ceph_msg *msg)
static int ceph_con_in_msg_alloc(struct ceph_connection *con, int *skip) static int ceph_con_in_msg_alloc(struct ceph_connection *con, int *skip)
{ {
struct ceph_msg_header *hdr = &con->in_hdr; struct ceph_msg_header *hdr = &con->in_hdr;
int type = le16_to_cpu(hdr->type);
int front_len = le32_to_cpu(hdr->front_len);
int middle_len = le32_to_cpu(hdr->middle_len); int middle_len = le32_to_cpu(hdr->middle_len);
struct ceph_msg *msg; struct ceph_msg *msg;
int ret = 0; int ret = 0;
BUG_ON(con->in_msg != NULL); BUG_ON(con->in_msg != NULL);
BUG_ON(!con->ops->alloc_msg);
if (con->ops->alloc_msg) { mutex_unlock(&con->mutex);
mutex_unlock(&con->mutex); msg = con->ops->alloc_msg(con, hdr, skip);
msg = con->ops->alloc_msg(con, hdr, skip); mutex_lock(&con->mutex);
mutex_lock(&con->mutex); if (con->state != CON_STATE_OPEN) {
if (con->state != CON_STATE_OPEN) { if (msg)
if (msg)
ceph_msg_put(msg);
return -EAGAIN;
}
con->in_msg = msg;
if (con->in_msg) {
con->in_msg->con = con->ops->get(con);
BUG_ON(con->in_msg->con == NULL);
}
if (*skip) {
con->in_msg = NULL;
return 0;
}
if (!con->in_msg) {
con->error_msg =
"error allocating memory for incoming message";
return -ENOMEM;
}
}
if (!con->in_msg) {
mutex_unlock(&con->mutex);
msg = ceph_msg_new(type, front_len, GFP_NOFS, false);
mutex_lock(&con->mutex);
if (!msg) {
pr_err("unable to allocate msg type %d len %d\n",
type, front_len);
return -ENOMEM;
}
if (con->state != CON_STATE_OPEN) {
ceph_msg_put(msg); ceph_msg_put(msg);
return -EAGAIN; return -EAGAIN;
} }
con->in_msg = msg; con->in_msg = msg;
if (con->in_msg) {
con->in_msg->con = con->ops->get(con); con->in_msg->con = con->ops->get(con);
BUG_ON(con->in_msg->con == NULL); BUG_ON(con->in_msg->con == NULL);
con->in_msg->page_alignment = le16_to_cpu(hdr->data_off); }
if (*skip) {
con->in_msg = NULL;
return 0;
}
if (!con->in_msg) {
con->error_msg =
"error allocating memory for incoming message";
return -ENOMEM;
} }
memcpy(&con->in_msg->hdr, &con->in_hdr, sizeof(con->in_hdr)); memcpy(&con->in_msg->hdr, &con->in_hdr, sizeof(con->in_hdr));