mds: eval_caps on cap removal

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index 0a26255fd059fdde915109f9f19bc8302266674f..2672bd641216a63db3c1024ccd035437f7eee242 100644 (file)
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -1947,7 +1947,7 @@ void Locker::handle_client_cap_release(MClientCapRelease *m)
     }
 
     dout(7) << "removing cap on " << *in << dendl;
-    mdcache->remove_client_cap(in, client, true);
+    mdcache->remove_client_cap(in, client);
   }
 
   delete m;

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 32e01c7add9692d5b526ac94e8c391c2201e77a9..9605733f3d1431d5596aa71e9f094629ab8d8190 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -5122,15 +5122,14 @@ void MDCache::check_memory_usage()
 }
 
 
-void MDCache::remove_client_cap(CInode *in, int client, bool eval)
+void MDCache::remove_client_cap(CInode *in, int client)
 {
   in->remove_client_cap(client);
 
   if (!in->is_auth())
     mds->locker->request_inode_file_caps(in);
   
-  if (eval)
-    mds->locker->eval_cap_gather(in);
+  mds->locker->eval_caps(in);
 
   // unlinked stray?  may need to purge (e.g., after all caps are released)
   if (in->inode.nlink == 0 &&

diff --git a/src/mds/MDCache.h b/src/mds/MDCache.h
index 5b63693771bc0e40a91f14088fc8555dec4e8823..c431fb9e7a6de2a541663bd17425657bfb2a3f3a 100644 (file)
--- a/src/mds/MDCache.h
+++ b/src/mds/MDCache.h
@@ -432,7 +432,7 @@ public:
   // -- client caps --
   __u64              last_cap_id;
   
-  void remove_client_cap(CInode *in, int client, bool eval=true);
+  void remove_client_cap(CInode *in, int client);
 
 
   // -- discover --