From: Greg Farnum <gregf@hq.newdream.net>
Date: Thu, 29 Jul 2010 21:20:31 +0000 (-0700)
Subject: osdmap: remove unused versions of get_[cluster_]inst
X-Git-Tag: v0.22~324
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=42c00850d913af493257695e53cb1de75f73b4ba;p=ceph.git

osdmap: remove unused versions of get_[cluster_]inst
---

diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h
index 58fff5561e8..59f60f23d5b 100644
--- a/src/osd/OSDMap.h
+++ b/src/osd/OSDMap.h
@@ -448,25 +448,11 @@ private:
     return entity_inst_t(entity_name_t::OSD(osd),
 			 osd_addr[osd]);
   }
-  bool get_inst(int osd, entity_inst_t& inst) { 
-    if (have_inst(osd)) {
-      inst.name = entity_name_t::OSD(osd);
-      inst.addr = osd_addr[osd];
-      return true;
-    } 
-    return false;
-  }
   entity_inst_t get_cluster_inst(int osd) {
     assert(exists(osd) && is_up(osd));
     if(osd_cluster_addr[osd] == entity_addr_t()) return get_inst(osd);
     return entity_inst_t(entity_name_t::OSD(osd), osd_cluster_addr[osd]);
   }
-  bool get_cluster_inst(int osd, entity_inst_t& inst) {
-    bool exists = get_inst(osd, inst);
-    if (exists && (osd_cluster_addr[osd] != entity_addr_t()))
-        inst.addr = osd_cluster_addr[osd];
-    return exists;
-  }
   entity_inst_t get_hb_inst(int osd) {
     assert(exists(osd));
     entity_inst_t i(entity_name_t::OSD(osd),