diff options
| author | Sage Weil <sage@newdream.net> | 2010-02-19 21:43:23 -0800 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2010-02-23 14:26:29 -0800 |
| commit | 5b3a4db3e4009aff918abb1353eb3f4925393a7b (patch) | |
| tree | 0f55666c827c3dfe31309209b69121e431366739 /fs/ceph/mon_client.c | |
| parent | bcd2cbd10ce31c950a40c08d7f601f8ff23537b8 (diff) | |
| download | talos-obmc-linux-5b3a4db3e4009aff918abb1353eb3f4925393a7b.tar.gz talos-obmc-linux-5b3a4db3e4009aff918abb1353eb3f4925393a7b.zip | |
ceph: fix up unexpected message handling
Fix skipping of unexpected message types from osd, mon.
Clean up pr_info and debug output.
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/mon_client.c')
| -rw-r--r-- | fs/ceph/mon_client.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/fs/ceph/mon_client.c b/fs/ceph/mon_client.c index 40d7d90bbed1..890597c09d43 100644 --- a/fs/ceph/mon_client.c +++ b/fs/ceph/mon_client.c @@ -763,7 +763,7 @@ static struct ceph_msg *mon_alloc_msg(struct ceph_connection *con, struct ceph_mon_client *monc = con->private; int type = le16_to_cpu(hdr->type); int front_len = le32_to_cpu(hdr->front_len); - struct ceph_msg *m; + struct ceph_msg *m = NULL; *skip = 0; @@ -777,13 +777,17 @@ static struct ceph_msg *mon_alloc_msg(struct ceph_connection *con, case CEPH_MSG_AUTH_REPLY: m = ceph_msgpool_get(&monc->msgpool_auth_reply, front_len); break; - default: - return NULL; + case CEPH_MSG_MON_MAP: + case CEPH_MSG_MDS_MAP: + case CEPH_MSG_OSD_MAP: + m = ceph_msg_new(type, front_len, 0, 0, NULL); + break; } - if (!m) + if (!m) { + pr_info("alloc_msg unknown type %d\n", type); *skip = 1; - + } return m; } |
