aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ceph/mon_client.c
diff options
context:
space:
mode:
authorYehuda Sadeh <yehuda@hq.newdream.net>2010-01-11 17:47:13 -0500
committerSage Weil <sage@newdream.net>2010-01-25 15:57:46 -0500
commit0547a9b30a5ac8680325752b61d3ffa9d4971b6e (patch)
tree0e54e227d44fab7b98c97ee4c3bed185a1238487 /fs/ceph/mon_client.c
parent9d7f0f139edfdce1a1539b100c617fd9182b0829 (diff)
ceph: alloc message data pages and check if tid exists
Now doing it in the same callback that is also responsible for allocating the 'front' part of the message. If we get a message that we haven't got a corresponding tid for, mark it for skipping. Moving the mutex unlock/lock from the osd alloc_msg callback to the calling function in the messenger. Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>
Diffstat (limited to 'fs/ceph/mon_client.c')
-rw-r--r--fs/ceph/mon_client.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ceph/mon_client.c b/fs/ceph/mon_client.c
index 6c00b37cc554..3f7ae7f73c50 100644
--- a/fs/ceph/mon_client.c
+++ b/fs/ceph/mon_client.c
@@ -701,6 +701,7 @@ static struct ceph_msg *mon_alloc_msg(struct ceph_connection *con,
701 struct ceph_msg *m; 701 struct ceph_msg *m;
702 702
703 *skip = 0; 703 *skip = 0;
704
704 switch (type) { 705 switch (type) {
705 case CEPH_MSG_MON_SUBSCRIBE_ACK: 706 case CEPH_MSG_MON_SUBSCRIBE_ACK:
706 m = ceph_msgpool_get(&monc->msgpool_subscribe_ack, front_len); 707 m = ceph_msgpool_get(&monc->msgpool_subscribe_ack, front_len);