From: Guang Yang <yguang@yahoo-inc.com>
Date: Tue, 29 Sep 2015 22:26:14 +0000 (+0000)
Subject: osd: _got_mon_epochs - refactor the lock scope to avoid a race (which fail make check)
X-Git-Tag: v10.0.1~26^2~41
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7bc4763ed720705c549bcc24d6d6c24878562a5f;p=ceph.git

osd: _got_mon_epochs - refactor the lock scope to avoid a race (which fail make check)

Reviewed-by: Guang Yang <yguang@yahoo-inc.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 14989e207e97..43bd5602adf8 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -4501,8 +4501,8 @@ void OSD::start_boot()
 
 void OSD::_got_mon_epochs(epoch_t oldest, epoch_t newest)
 {
+  Mutex::Locker l(osd_lock);
   if (is_preboot()) {
-    Mutex::Locker l(osd_lock);
     _preboot(oldest, newest);
   }
 }