SERVER-13681 Revert "SERVER-7378 Prevent WRITETODATAFILES and FlushViewOfFile from running at the same time"

This reverts commit 5352345eda2ffa24a72af1d5bbaccaa32bcb1006

2 files changed, 0 insertions, 10 deletions

diff --git a/src/mongo/db/storage/mmap_v1/dur_writetodatafiles.cpp b/src/mongo/db/storage/mmap_v1/dur_writetodatafiles.cpp
index 4b39ffc744f..b582bea8c4f 100644
--- a/src/mongo/db/storage/mmap_v1/dur_writetodatafiles.cpp
+++ b/src/mongo/db/storage/mmap_v1/dur_writetodatafiles.cpp
@@ -41,9 +41,6 @@ namespace mongo {
 
     MONGO_LOG_DEFAULT_COMPONENT_FILE(::mongo::logger::LogComponent::kStorage);
 
-#ifdef _WIN32
-    extern SimpleMutex globalFlushMutex; // defined in mongo/util/mmap_win.cpp
-#endif
     namespace dur {
 
         void debugValidateAllMapsMatch();
@@ -103,9 +100,6 @@ namespace mongo {
         */
 
         void WRITETODATAFILES(const JSectHeader& h, AlignedBuilder& uncompressed) {
-#ifdef _WIN32
-            SimpleMutex::scoped_lock _globalFlushMutex(globalFlushMutex);
-#endif
             Timer t;
             WRITETODATAFILES_Impl1(h, uncompressed);
             long long m = t.micros();
diff --git a/src/mongo/util/mmap_win.cpp b/src/mongo/util/mmap_win.cpp
index e2f464a4a00..fbea0a2a143 100644
--- a/src/mongo/util/mmap_win.cpp
+++ b/src/mongo/util/mmap_win.cpp
@@ -483,9 +483,6 @@ namespace mongo {
         return newPrivateView;
     }
 
-    // prevent WRITETODATAFILES() from running at the same time as FlushViewOfFile()
-    SimpleMutex globalFlushMutex("globalFlushMutex");
-
     class WindowsFlushable : public MemoryMappedFile::Flushable {
     public:
         WindowsFlushable( MemoryMappedFile* theFile,
@@ -516,7 +513,6 @@ namespace mongo {
                 _flushMutex.lock();
             }
 
-            SimpleMutex::scoped_lock _globalFlushMutex(globalFlushMutex);
             boost::lock_guard<boost::mutex> lk(_flushMutex, boost::adopt_lock_t());
 
             int loopCount = 0;