From: Sage Weil <sage@newdream.net>
Date: Fri, 4 Sep 2009 22:50:08 +0000 (-0700)
Subject: mds: only move ScatterLock to MIX if WR is wanted
X-Git-Tag: v0.14~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7a6f1147a32a940293d77e1b24841f3613242616;p=ceph.git

mds: only move ScatterLock to MIX if WR is wanted

Not WR|RD!
---

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index 447db39ee0c..2ac251034a7 100644
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -3172,7 +3172,7 @@ void Locker::file_eval(ScatterLock *lock, bool *need_issue)
 	   //!lock->is_rdlocked() &&
 	   //!lock->is_waiter_for(SimpleLock::WAIT_WR) &&
 	   (lock->get_scatter_wanted() ||
-	    (in->multiple_nonstale_caps() && (wanted & (CEPH_CAP_GRD|CEPH_CAP_GWR))))) {
+	    (in->multiple_nonstale_caps() && (wanted & CEPH_CAP_GWR)))) {
     dout(7) << "file_eval stable, bump to mixed " << *lock
 	    << " on " << *lock->get_parent() << dendl;
     file_mixed(lock, need_issue);