From: Dan Mick <dan.mick@redhat.com>
Date: Mon, 24 Apr 2017 22:36:45 +0000 (-0700)
Subject: common/config.cc md_config_t::parse_config_files: return ENOENT
X-Git-Tag: v12.0.3~245^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cd96ee5f802413dc2ce7f731d2d50f78c9e5f350;p=ceph.git

common/config.cc md_config_t::parse_config_files: return ENOENT

If the only error we get is ENOENT, pass that back instead of
EINVAL, as it more-accurately reflects the error(s)

Signed-off-by: Dan Mick <dan.mick@redhat.com>
---

diff --git a/src/common/config.cc b/src/common/config.cc
index 9bad60b31ffb..9fef25d209c4 100644
--- a/src/common/config.cc
+++ b/src/common/config.cc
@@ -302,8 +302,9 @@ int md_config_t::parse_config_files_impl(const std::list<std::string> &conf_file
     else if (ret != -ENOENT)
       return ret;
   }
+  // it must have been all ENOENTs, that's the only way we got here
   if (c == conf_files.end())
-    return -EINVAL;
+    return -ENOENT;
 
   if (cluster.size() == 0) {
     /*