From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 13 Jan 2016 14:53:29 +0000 (-0500)
Subject: osdc: hold rwlock when updating crush location config
X-Git-Tag: v10.0.3~46^2~1^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F7208%2Fhead;p=ceph.git

osdc: hold rwlock when updating crush location config

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 25f2b858887e..9d6df99093a0 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -168,6 +168,7 @@ void Objecter::handle_conf_change(const struct md_config_t *conf,
 
 void Objecter::update_crush_location()
 {
+  RWLock::WLocker rwlocker(rwlock);
   crush_location.clear();
   vector<string> lvec;
   get_str_vec(cct->_conf->crush_location, ";, \t", lvec);