mds: always pass pick_inode_snap the head

This fixes a possible infinite loop in handle_client_caps().  We need to
_always_ pass the head inode in.

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index cf2da38955551d6539a2e8126a2bf1079d761833..1005d2fe11312d4977288670e2bb1dcfbd118abf 100644 (file)
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -1832,7 +1832,7 @@ void Locker::handle_client_caps(MClientCaps *m)
       break;
     
     // next!
-    in = mdcache->pick_inode_snap(in, in->last);
+    in = mdcache->pick_inode_snap(head_in, in->last);
     cap = in->get_client_cap(client);
     assert(cap);    
   }

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 92da3351039152255c93c57e1e899060ae618d9f..209eafa3e95260fe2480ac6c21e1d877f61c5f24 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -1221,6 +1221,7 @@ int MDCache::num_subtrees_fullnonauth()
 CInode *MDCache::pick_inode_snap(CInode *in, snapid_t follows)
 {
   dout(10) << "pick_inode_snap follows " << follows << " on " << *in << dendl;
+  assert(in->last == CEPH_NOSNAP);
 
   SnapRealm *realm = in->find_snaprealm();
   const set<snapid_t>& snaps = realm->get_snaps();