From d288cdb78f5a9cbf12e27d12544885dcf2b48f8e Mon Sep 17 00:00:00 2001 From: Michal Jarzabek Date: Wed, 29 Jun 2016 20:57:38 +0100 Subject: [PATCH] msg/AsyncMessenger.cc: remove code duplication Signed-off-by: Michal Jarzabek --- src/msg/async/AsyncMessenger.cc | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/msg/async/AsyncMessenger.cc b/src/msg/async/AsyncMessenger.cc index ff3223450b403..90bb30dac6487 100644 --- a/src/msg/async/AsyncMessenger.cc +++ b/src/msg/async/AsyncMessenger.cc @@ -830,18 +830,10 @@ int AsyncMessenger::get_proto_version(int peer_type, bool connect) return cluster_protocol; } else { // public - if (connect) { - switch (peer_type) { - case CEPH_ENTITY_TYPE_OSD: return CEPH_OSDC_PROTOCOL; - case CEPH_ENTITY_TYPE_MDS: return CEPH_MDSC_PROTOCOL; - case CEPH_ENTITY_TYPE_MON: return CEPH_MONC_PROTOCOL; - } - } else { - switch (my_type) { - case CEPH_ENTITY_TYPE_OSD: return CEPH_OSDC_PROTOCOL; - case CEPH_ENTITY_TYPE_MDS: return CEPH_MDSC_PROTOCOL; - case CEPH_ENTITY_TYPE_MON: return CEPH_MONC_PROTOCOL; - } + switch (connect ? peer_type : my_type) { + case CEPH_ENTITY_TYPE_OSD: return CEPH_OSDC_PROTOCOL; + case CEPH_ENTITY_TYPE_MDS: return CEPH_MDSC_PROTOCOL; + case CEPH_ENTITY_TYPE_MON: return CEPH_MONC_PROTOCOL; } } return 0; -- 2.39.5