crush: return -1 on error from get_type_id

So we can distinguish between a bad type name and type 0.

Fix both callers, too.

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

diff --git a/src/crush/CrushWrapper.cc b/src/crush/CrushWrapper.cc
index 1fc86893e1d0421f05f5fba10230b949ae7986bb..e8058d60a57efa3f844b7f2b18a06a0e5b2d814f 100644 (file)
--- a/src/crush/CrushWrapper.cc
+++ b/src/crush/CrushWrapper.cc
@@ -641,8 +641,9 @@ int CrushWrapper::add_simple_rule(string name, string root_name, string failure_
   int type = 0;
   if (failure_domain_name.length()) {
     type = get_type_id(failure_domain_name);
-    if (type <= 0) // bah, returns 0 on error; but its ok, device isn't a domain really
+    if (type < 0) {
       return -EINVAL;
+    }
   }
 
   int ruleset = 0;

diff --git a/src/crush/CrushWrapper.h b/src/crush/CrushWrapper.h
index 9109156d066d3ae8ced697964203ee0826b6e0af..ac936336125ccebde4641b3127f9c55dd3e28e59 100644 (file)
--- a/src/crush/CrushWrapper.h
+++ b/src/crush/CrushWrapper.h
@@ -166,7 +166,7 @@ public:
     build_rmaps();
     if (type_rmap.count(name))
       return type_rmap[name];
-    return 0;
+    return -1;
   }
   const char *get_type_name(int t) const {
     std::map<int,string>::const_iterator p = type_map.find(t);

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index d46c28f6ff277b9b2625d50b2f415c578fcf3815..75105cadadf9221884580394838d347ca73d0dee 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -2557,7 +2557,7 @@ bool OSDMonitor::prepare_command(MMonCommand *m)
          err = 0;
        } else {
          int type = newcrush.get_type_id(m->cmd[4]);
-         if (type <= 0) {
+         if (type < 0) {
            ss << "type '" << m->cmd[4] << "' does not exist";
            err = -EINVAL;
            break;