From 4b3e3d782667e6e2aa01496836921fe65e930885 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Fri, 23 May 2008 10:44:14 -0700
Subject: [PATCH] mds: pass force down into get_wrlock()

---
 src/mds/FileLock.h | 4 ++--
 src/mds/Locker.cc  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mds/FileLock.h b/src/mds/FileLock.h
index aa0b3f0c16278..bd8d8d3449b39 100644
--- a/src/mds/FileLock.h
+++ b/src/mds/FileLock.h
@@ -169,8 +169,8 @@ class FileLock : public SimpleLock {
       state == LOCK_LONER || state == LOCK_GLONERM ||
       state == LOCK_GSYNCM || state == LOCK_GSYNCL;
   }
-  void get_wrlock() {
-    assert(can_wrlock());
+  void get_wrlock(bool force=false) {
+    assert(force || can_wrlock());
     if (num_wrlock == 0) parent->get(MDSCacheObject::PIN_LOCK);
     ++num_wrlock;
   }
diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index 0238c6f9555d8..0a6381ab89b02 100644
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -2606,7 +2606,7 @@ bool Locker::file_wrlock_start(FileLock *lock, bool force)
   dout(7) << "file_wrlock_start  on " << *lock
 	  << " on " << *lock->get_parent() << dendl;  
   assert(force || lock->can_wrlock());
-  lock->get_wrlock();
+  lock->get_wrlock(force);
   return true;
 
   /*
-- 
2.39.5