From: Joao Eduardo Luis <joao@redhat.com>
Date: Fri, 17 Oct 2014 17:01:05 +0000 (+0100)
Subject: mon: MDSMonitor: don't return -EINVAL if function is bool
X-Git-Tag: v0.87.2~21^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b318e2ffc3faedf6b02908429eb4ce79147d3471;p=ceph.git

mon: MDSMonitor: don't return -EINVAL if function is bool

Returning -EINVAL on a function that expects bool and the error code to
be in a variable 'r' can only achieve one thing: if this path is ever
touched, instead of returning an error as it was supposed to, we're
returning 'true' with 'r = 0' and, for no apparent reason, the user will
think everything went smoothly but with no new fs created.

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
(cherry picked from commit 91b2a2b69b198567d42f45f75b7f7ea559f89150)
---

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index c488a8928c07..cefac62558e4 100644
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -1091,7 +1091,8 @@ bool MDSMonitor::management_command(
         // Ensure fs name is not empty so that we can implement
         // commmands that refer to FS by name in future.
         ss << "Filesystem name may not be empty";
-        return -EINVAL;
+        r = -EINVAL;
+        return true;
     }
 
     if (pending_mdsmap.get_enabled()