jump more easily into scatter state when unreplicated and unlocked

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1570 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/branches/sage/mds/mds/Locker.cc b/branches/sage/mds/mds/Locker.cc
index 67e4f611429c7ed4e8f82d80bb8d2e4a2dbd420d..f9f0501e559a0726295802946ec34c335b0ac5e7 100644 (file)
--- a/branches/sage/mds/mds/Locker.cc
+++ b/branches/sage/mds/mds/Locker.cc
@@ -1326,7 +1326,8 @@ bool Locker::scatter_wrlock_start(ScatterLock *lock, MDRequest *mdr)
       !lock->is_rdlocked() &&
       !lock->is_xlocked() &&
       lock->get_state() == LOCK_SYNC) 
-    scatter_scatter(lock);
+    lock->set_state(LOCK_SCATTER);
+  //scatter_scatter(lock);
 
   // can wrlock?
   if (lock->can_wrlock()) {