mds: flush log on wrlock_start if lock isn't stable

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index aa589a316d8c3e3b39ae8c473e8ae36dd7edd289..2ada52470af6cdc127bb82adbb0285bbd65b88b6 100644 (file)
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -698,7 +698,8 @@ bool Locker::wrlock_start(SimpleLock *lock, MDRequest *mut, bool nowait)
     lock->add_waiter(SimpleLock::WAIT_STABLE, new C_MDS_RetryRequest(mdcache, mut));
   
     // make sure we aren't waiting on a cap flush
-    if (lock->get_parent()->is_auth() && lock->is_wrlocked())
+    if (lock->get_parent()->is_auth() && (lock->is_wrlocked() ||  // as with cap flush
+                                         !lock->is_stable()))    // as with xlockdone
       mds->mdlog->flush();
   }