don't return from _unlockFsync until we're unlocked

1 files changed, 6 insertions, 0 deletions

diff --git a/src/mongo/db/commands/fsync.cpp b/src/mongo/db/commands/fsync.cpp
index d575f35a09c..3f8a25e6a91 100644
--- a/src/mongo/db/commands/fsync.cpp
+++ b/src/mongo/db/commands/fsync.cpp
@@ -130,6 +130,8 @@ namespace mongo {
         
         fsyncCmd.locked = false;
         fsyncCmd.err = "unlocked";
+
+        fsyncCmd._unlockSync.notify_one();
     }
 
     bool lockedForWriting() { 
@@ -145,6 +147,10 @@ namespace mongo {
         fsyncCmd.pendingUnlock = true;
         fsyncCmd._unlockSync.notify_one();
         fsyncCmd._threadSync.notify_one();
+        
+        while ( fsyncCmd.locked ) {
+            fsyncCmd._unlockSync.wait( fsyncCmd.m );
+        }
         return true;
     }
 }