From: Sage Weil <sage@newdream.net>
Date: Thu, 19 Aug 2010 22:36:26 +0000 (-0700)
Subject: mds: don't auth_pin non-auth wrlock targets
X-Git-Tag: v0.22~236^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=067d8bb0d198ee910f9f31146fbb205f05bd5910;p=ceph.git

mds: don't auth_pin non-auth wrlock targets
---

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index 8b5f56120211..94dc89d86bba 100644
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -197,11 +197,6 @@ bool Locker::acquire_locks(MDRequest *mdr,
     sorted.insert(*p);
     if ((*p)->get_parent()->is_auth())
       mustpin.insert(*p);
-    else if ((*p)->get_type() == CEPH_LOCK_IFILE &&
-	     !(*p)->get_parent()->is_auth() && !(*p)->can_wrlock(client)) { // we might have to request a scatter
-      dout(15) << " will also auth_pin " << *(*p)->get_parent() << " in case we need to request a scatter" << dendl;
-      mustpin.insert(*p);
-    }
   }
 
   // rdlocks