From: Sage Weil <sage@redhat.com>
Date: Mon, 4 Jun 2018 15:59:51 +0000 (-0500)
Subject: common/config: fix rm_val error codes
X-Git-Tag: v13.2.1~108^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bb30ae4bf0155c9d1c261ecc9e5091fc4c892807;p=ceph.git

common/config: fix rm_val error codes

EINVAL if the config option is invalid.
ENOENT if the config option wasn't set.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 4f957a4ad7fb7029435f38a1da086d59f34f3428)
---

diff --git a/src/common/config.cc b/src/common/config.cc
index d4649ae2fe8b..8becf6a42c00 100644
--- a/src/common/config.cc
+++ b/src/common/config.cc
@@ -1413,6 +1413,9 @@ void md_config_t::_refresh(const Option& opt)
 
 int md_config_t::_rm_val(const std::string& key, int level)
 {
+  if (schema.count(key) == 0) {
+    return -EINVAL;
+  }
   auto i = values.find(key);
   if (i == values.end()) {
     return -ENOENT;