1 files changed, 15 insertions, 15 deletions

diff --git a/src/mongo/db/s/balancer/balancer.cpp b/src/mongo/db/s/balancer/balancer.cpp
index a920dd64ba9..9a2fadb8327 100644
--- a/src/mongo/db/s/balancer/balancer.cpp
+++ b/src/mongo/db/s/balancer/balancer.cpp
@@ -164,7 +164,7 @@ Balancer::Balancer(ServiceContext* serviceContext)
 
 Balancer::~Balancer() {
     // The balancer thread must have been stopped
-    stdx::lock_guard<stdx::mutex> scopedLock(_mutex);
+    stdx::lock_guard<Latch> scopedLock(_mutex);
     invariant(_state == kStopped);
 }
 
@@ -182,7 +182,7 @@ Balancer* Balancer::get(OperationContext* operationContext) {
 }
 
 void Balancer::initiateBalancer(OperationContext* opCtx) {
-    stdx::lock_guard<stdx::mutex> scopedLock(_mutex);
+    stdx::lock_guard<Latch> scopedLock(_mutex);
     invariant(_state == kStopped);
     _state = kRunning;
 
@@ -194,7 +194,7 @@ void Balancer::initiateBalancer(OperationContext* opCtx) {
 }
 
 void Balancer::interruptBalancer() {
-    stdx::lock_guard<stdx::mutex> scopedLock(_mutex);
+    stdx::lock_guard<Latch> scopedLock(_mutex);
     if (_state != kRunning)
         return;
 
@@ -218,7 +218,7 @@ void Balancer::interruptBalancer() {
 
 void Balancer::waitForBalancerToStop() {
     {
-        stdx::lock_guard<stdx::mutex> scopedLock(_mutex);
+        stdx::lock_guard<Latch> scopedLock(_mutex);
         if (_state == kStopped)
             return;
 
@@ -228,7 +228,7 @@ void Balancer::waitForBalancerToStop() {
 
     _thread.join();
 
-    stdx::lock_guard<stdx::mutex> scopedLock(_mutex);
+    stdx::lock_guard<Latch> scopedLock(_mutex);
     _state = kStopped;
     _thread = {};
 
@@ -236,7 +236,7 @@ void Balancer::waitForBalancerToStop() {
 }
 
 void Balancer::joinCurrentRound(OperationContext* opCtx) {
-    stdx::unique_lock<stdx::mutex> scopedLock(_mutex);
+    stdx::unique_lock<Latch> scopedLock(_mutex);
     const auto numRoundsAtStart = _numBalancerRounds;
     opCtx->waitForConditionOrInterrupt(_condVar, scopedLock, [&] {
         return !_inBalancerRound || _numBalancerRounds != numRoundsAtStart;
@@ -289,7 +289,7 @@ void Balancer::report(OperationContext* opCtx, BSONObjBuilder* builder) {
 
     const auto mode = balancerConfig->getBalancerMode();
 
-    stdx::lock_guard<stdx::mutex> scopedLock(_mutex);
+    stdx::lock_guard<Latch> scopedLock(_mutex);
     builder->append("mode", BalancerSettingsType::kBalancerModes[mode]);
     builder->append("inBalancerRound", _inBalancerRound);
     builder->append("numBalancerRounds", _numBalancerRounds);
@@ -303,7 +303,7 @@ void Balancer::_mainThread() {
     log() << "CSRS balancer is starting";
 
     {
-        stdx::lock_guard<stdx::mutex> scopedLock(_mutex);
+        stdx::lock_guard<Latch> scopedLock(_mutex);
         _threadOperationContext = opCtx.get();
     }
 
@@ -423,7 +423,7 @@ void Balancer::_mainThread() {
     }
 
     {
-        stdx::lock_guard<stdx::mutex> scopedLock(_mutex);
+        stdx::lock_guard<Latch> scopedLock(_mutex);
         invariant(_state == kStopping);
         invariant(_migrationManagerInterruptThread.joinable());
     }
@@ -432,7 +432,7 @@ void Balancer::_mainThread() {
     _migrationManager.drainActiveMigrations();
 
     {
-        stdx::lock_guard<stdx::mutex> scopedLock(_mutex);
+        stdx::lock_guard<Latch> scopedLock(_mutex);
         _migrationManagerInterruptThread = {};
         _threadOperationContext = nullptr;
     }
@@ -441,19 +441,19 @@ void Balancer::_mainThread() {
 }
 
 bool Balancer::_stopRequested() {
-    stdx::lock_guard<stdx::mutex> scopedLock(_mutex);
+    stdx::lock_guard<Latch> scopedLock(_mutex);
     return (_state != kRunning);
 }
 
 void Balancer::_beginRound(OperationContext* opCtx) {
-    stdx::unique_lock<stdx::mutex> lock(_mutex);
+    stdx::unique_lock<Latch> lock(_mutex);
     _inBalancerRound = true;
     _condVar.notify_all();
 }
 
 void Balancer::_endRound(OperationContext* opCtx, Milliseconds waitTimeout) {
     {
-        stdx::lock_guard<stdx::mutex> lock(_mutex);
+        stdx::lock_guard<Latch> lock(_mutex);
         _inBalancerRound = false;
         _numBalancerRounds++;
         _condVar.notify_all();
@@ -464,7 +464,7 @@ void Balancer::_endRound(OperationContext* opCtx, Milliseconds waitTimeout) {
 }
 
 void Balancer::_sleepFor(OperationContext* opCtx, Milliseconds waitTimeout) {
-    stdx::unique_lock<stdx::mutex> lock(_mutex);
+    stdx::unique_lock<Latch> lock(_mutex);
     _condVar.wait_for(lock, waitTimeout.toSystemDuration(), [&] { return _state != kRunning; });
 }
 
@@ -672,7 +672,7 @@ void Balancer::_splitOrMarkJumbo(OperationContext* opCtx,
 }
 
 void Balancer::notifyPersistedBalancerSettingsChanged() {
-    stdx::unique_lock<stdx::mutex> lock(_mutex);
+    stdx::unique_lock<Latch> lock(_mutex);
     _condVar.notify_all();
 }