dbtests was broken on windows debug build after _rotate call change

2 files changed, 1 insertions, 8 deletions

diff --git a/db/dur.cpp b/db/dur.cpp
index 7c71d9aefa5..cc3a985546d 100644
--- a/db/dur.cpp
+++ b/db/dur.cpp
@@ -685,8 +685,6 @@ namespace mongo {
             }
         }
 
-        CodeBlock durThreadMain;
-
         filesystem::path getJournalDir();
 
         void durThread() {
@@ -697,8 +695,6 @@ namespace mongo {
             catch(...) { }
 
             while( !inShutdown() ) {
-                CodeBlock::Within w(durThreadMain);
-
                 unsigned ms = cmdLine.journalCommitInterval;
                 if( ms == 0 ) { 
                     // use default
diff --git a/db/dur_journal.cpp b/db/dur_journal.cpp
index 787cfdbe9dc..108a2e7b620 100644
--- a/db/dur_journal.cpp
+++ b/db/dur_journal.cpp
@@ -81,8 +81,6 @@ namespace mongo {
             return getJournalDir()/"lsn";
         }
 
-        extern CodeBlock durThreadMain;
-
         /** this should be called when something really bad happens so that we can flag appropriately
         */
         void journalingFailure(const char *msg) {
@@ -528,7 +526,6 @@ namespace mongo {
         void Journal::updateLSNFile() {
             if( !_writeToLSNNeeded )
                 return;
-            durThreadMain.assertWithin();
             _writeToLSNNeeded = false;
             try {
                 // os can flush as it likes.  if it flushes slowly, we will just do extra work on recovery.
@@ -639,7 +636,7 @@ namespace mongo {
         }
 
         /** write (append) the buffer we have built to the journal and fsync it.
-            outside of lock as that could be slow.
+            outside of dbMutex lock as this could be slow.
             @param uncompressed - a buffer that will be written to the journal after compression
             will not return until on disk
         */