]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
msg/AsyncMessenger.cc: remove code duplication 10030/head
authorMichal Jarzabek <stiopa@gmail.com>
Wed, 29 Jun 2016 19:57:38 +0000 (20:57 +0100)
committerMichal Jarzabek <stiopa@gmail.com>
Wed, 29 Jun 2016 19:57:38 +0000 (20:57 +0100)
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
src/msg/async/AsyncMessenger.cc

index ff3223450b403e8e1a533c1c52ec7b37f301c092..90bb30dac6487ae8388fa8f529a8750d94795157 100644 (file)
@@ -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;