From f833d886cbc2a443685e04dc7013850cffafe58e Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 14 Nov 2008 16:58:37 -0800 Subject: [PATCH] msgr: small cleanup --- src/msg/SimpleMessenger.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc index e88d099b7ac35..e4401f73d4976 100644 --- a/src/msg/SimpleMessenger.cc +++ b/src/msg/SimpleMessenger.cc @@ -1514,19 +1514,19 @@ void Rank::Pipe::reader() else if (tag == CEPH_MSGR_TAG_MSG) { dout(20) << "reader got MSG" << dendl; Message *m = read_message(); + lock.Lock(); + if (!m) { derr(2) << "reader read null message, " << strerror(errno) << dendl; - lock.Lock(); fault(false, true); continue; } - // note received seq# - lock.Lock(); if (state == STATE_CLOSED || state == STATE_CONNECTING) continue; + // check received seq# if (m->get_seq() <= in_seq) { dout(-10) << "reader got old message " << m->get_seq() << " <= " << in_seq << " " << m << " " << *m -- 2.39.5