From: Josh Durgin <jdurgin@redhat.com>
Date: Mon, 24 Aug 2015 22:40:39 +0000 (-0700)
Subject: config: skip lockdep for intentionally recursive md_config_t lock
X-Git-Tag: v0.94.4~33^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F5759%2Fhead;p=ceph.git

config: skip lockdep for intentionally recursive md_config_t lock

lockdep can't handle recursive locks, resulting in false positive
reports for certain set_val_or_die() calls, like via
md_config_t::parse_argv() passed "-m".

Fixes: #12614
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit 415226995ebe841cc9e8639a3233150a75aecaed)
---

diff --git a/src/common/config.cc b/src/common/config.cc
index 5e923e6fa65..3b0ed628c48 100644
--- a/src/common/config.cc
+++ b/src/common/config.cc
@@ -148,7 +148,7 @@ md_config_t::md_config_t()
 #undef OPTION
 #undef SUBSYS
 #undef DEFAULT_SUBSYS
-  lock("md_config_t", true)
+  lock("md_config_t", true, false)
 {
   init_subsys();
 }