begin the process of putting global vairables in one central location. in particular, d_globals.h for mongod.

this surfaced some things such as references to dbMutex from things that don't actually use it, which resulted
in more changes to clean those up

1 files changed, 3 insertions, 3 deletions

diff --git a/s/d_migrate.cpp b/s/d_migrate.cpp
index ac4e3a77d5c..5e62661ec7e 100644
--- a/s/d_migrate.cpp
+++ b/s/d_migrate.cpp
@@ -515,7 +515,7 @@ namespace mongo {
         }
 
         void aboutToDelete( const Database* db , const DiskLoc& dl ) {
-            dbMutex.assertWriteLocked();
+            d.dbMutex.assertWriteLocked();
 
             if ( ! _getActive() )
                 return;
@@ -603,7 +603,7 @@ namespace mongo {
         int loops = 0;
         Timer t;
         while ( t.seconds() < 900 ) { // 15 minutes
-            assert( dbMutex.getState() == 0 );
+            assert( d.dbMutex.getState() == 0 );
             sleepmillis( 20 );
 
             set<CursorId> now;
@@ -911,7 +911,7 @@ namespace mongo {
 
             // 4.
             for ( int i=0; i<86400; i++ ) { // don't want a single chunk move to take more than a day
-                assert( dbMutex.getState() == 0 );
+                assert( d.dbMutex.getState() == 0 );
                 sleepsecs( 1 );
                 ScopedDbConnection conn( to );
                 BSONObj res;