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/messenger.c | |
| parent | bcd2cbd10ce31c950a40c08d7f601f8ff23537b8 (diff) | |
| download | kernel_samsung_smdk4412-5b3a4db3e4009aff918abb1353eb3f4925393a7b.zip kernel_samsung_smdk4412-5b3a4db3e4009aff918abb1353eb3f4925393a7b.tar.gz kernel_samsung_smdk4412-5b3a4db3e4009aff918abb1353eb3f4925393a7b.tar.bz2 | |
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/messenger.c')
| -rw-r--r-- | fs/ceph/messenger.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ceph/messenger.c b/fs/ceph/messenger.c index ca2ad0e..fdda707 100644 --- a/fs/ceph/messenger.c +++ b/fs/ceph/messenger.c @@ -1361,7 +1361,7 @@ static int read_partial_message(struct ceph_connection *con) con->in_msg = ceph_alloc_msg(con, &con->in_hdr, &skip); if (skip) { /* skip this message */ - pr_err("alloc_msg returned NULL, skipping message\n"); + dout("alloc_msg returned NULL, skipping message\n"); con->in_base_pos = -front_len - middle_len - data_len - sizeof(m->footer); con->in_tag = CEPH_MSGR_TAG_READY; @@ -1370,7 +1370,8 @@ static int read_partial_message(struct ceph_connection *con) if (IS_ERR(con->in_msg)) { ret = PTR_ERR(con->in_msg); con->in_msg = NULL; - con->error_msg = "error allocating memory for incoming message"; + con->error_msg = + "error allocating memory for incoming message"; return ret; } m = con->in_msg; |