]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: don't auth_pin non-auth wrlock targets
authorSage Weil <sage@newdream.net>
Thu, 19 Aug 2010 22:36:26 +0000 (15:36 -0700)
committerSage Weil <sage@newdream.net>
Tue, 24 Aug 2010 03:23:14 +0000 (20:23 -0700)
src/mds/Locker.cc

index 8b5f561202118779416082d364763e407da3d40d..94dc89d86bbad6134308844de425262eb09c276b 100644 (file)
@@ -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