]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: _got_mon_epochs - refactor the lock scope to avoid a race (which fail make check)
authorGuang Yang <yguang@yahoo-inc.com>
Tue, 29 Sep 2015 22:26:14 +0000 (22:26 +0000)
committerSage Weil <sage@redhat.com>
Mon, 23 Nov 2015 13:36:15 +0000 (08:36 -0500)
Reviewed-by: Guang Yang <yguang@yahoo-inc.com>
src/osd/OSD.cc

index 14989e207e97423618c39e57c3f063ea6dec7dab..43bd5602adf8c9d93fa6d35d27fb0454b7585fb8 100644 (file)
@@ -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);
   }
 }