summaryrefslogtreecommitdiffstats
path: root/src/msg
diff options
context:
space:
mode:
authorKefu Chai <tchaikov@gmail.com>2017-04-11 11:41:56 +0200
committerGitHub <noreply@github.com>2017-04-11 11:41:56 +0200
commit1efff5297f811d081dd56a251ff9fb9b41fe4252 (patch)
treee4fcf81bf429a1518882910e2700a451cd634fd5 /src/msg
parentMerge pull request #13940 from Adirl/out (diff)
parentceph_fuse.cc: fix 64/32bit detection (diff)
downloadceph-1efff5297f811d081dd56a251ff9fb9b41fe4252.tar.xz
ceph-1efff5297f811d081dd56a251ff9fb9b41fe4252.zip
Merge pull request #14426 from tchaikov/wip-13562-kefu
misc: SCA fixes Reviewed-by: Kefu Chai <kchai@redhat.com>
Diffstat (limited to 'src/msg')
-rw-r--r--src/msg/async/AsyncMessenger.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/msg/async/AsyncMessenger.cc b/src/msg/async/AsyncMessenger.cc
index f7fc213fe30..b6345523747 100644
--- a/src/msg/async/AsyncMessenger.cc
+++ b/src/msg/async/AsyncMessenger.cc
@@ -533,9 +533,11 @@ ConnectionRef AsyncMessenger::get_loopback_connection()
int AsyncMessenger::_send_message(Message *m, const entity_inst_t& dest)
{
FUNCTRACE();
- if (m && m->get_type() == CEPH_MSG_OSD_OP)
+ assert(m);
+
+ if (m->get_type() == CEPH_MSG_OSD_OP)
OID_EVENT_TRACE(((MOSDOp *)m)->get_oid().name.c_str(), "SEND_MSG_OSD_OP");
- else if (m && m->get_type() == CEPH_MSG_OSD_OPREPLY)
+ else if (m->get_type() == CEPH_MSG_OSD_OPREPLY)
OID_EVENT_TRACE(((MOSDOpReply *)m)->get_oid().name.c_str(), "SEND_MSG_OSD_OP_REPLY");
ldout(cct, 1) << __func__ << "--> " << dest.name << " "