osd/OSDMap: fix typo and crush types helper

Bah!

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 48d21911111b355e4f8551b3971645fa349f2e6b..3ebd3165cc2dbcd1b33af41975b155baf183bbb2 100644 (file)
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -1835,8 +1835,8 @@ int OSDMap::_build_crush_types(CrushWrapper& crush)
   crush.set_type_name(2, "chassis");
   crush.set_type_name(3, "rack");
   crush.set_type_name(4, "row");
-  crush.set_type_naem(5, "pdu");
-  crush.set_type_naem(6, "pod");
+  crush.set_type_name(5, "pdu");
+  crush.set_type_name(6, "pod");
   crush.set_type_name(7, "room");
   crush.set_type_name(8, "datacenter");
   crush.set_type_name(9, "region");

diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h
index 105c979453e580a740a742ac4bcc02dfb645416d..7b6cb1e6c9d4b3ae8d65d6d8e874a6909889a36e 100644 (file)
--- a/src/osd/OSDMap.h
+++ b/src/osd/OSDMap.h
@@ -597,11 +597,11 @@ public:
    * handy helpers to build simple maps...
    */
   /// build crush bucket types.  @return 'root' type id
-  int _build_crush_types(CrushWrapper& crush);
   void build_simple(CephContext *cct, epoch_t e, uuid_d &fsid,
                    int num_osd, int pg_bits, int pgp_bits);
   int build_simple_from_conf(CephContext *cct, epoch_t e, uuid_d &fsid,
                             int pg_bits, int pgp_bits);
+  static int _build_crush_types(CrushWrapper& crush);
   static void build_simple_crush_map(CephContext *cct, CrushWrapper& crush,
                                     map<int, const char*>& poolsets, int num_osd);
   static void build_simple_crush_map_from_conf(CephContext *cct, CrushWrapper& crush,