import 15.2.2 octopus source

[ceph.git] / ceph / src / mds / Mutation.cc

diff --git a/ceph/src/mds/Mutation.cc b/ceph/src/mds/Mutation.cc
index 03555b4f09805246f4b578b0b622a0d6afb27f22..d9f3f7cadcc60b049014a2096d964b0027d5f56f 100644 (file)
--- a/ceph/src/mds/Mutation.cc
+++ b/ceph/src/mds/Mutation.cc
@@ -578,7 +578,7 @@ void MDLockCache::attach_dirfrags(std::vector<CDir*>&& dfv)
   }
 }
 
-void MDLockCache::detach_all()
+void MDLockCache::detach_locks()
 {
   ceph_assert(items_lock);
   int i = 0;
@@ -588,9 +588,12 @@ void MDLockCache::detach_all()
     ++i;
   }
   items_lock.reset();
+}
 
+void MDLockCache::detach_dirfrags()
+{
   ceph_assert(items_dir);
-  i = 0;
+  int i = 0;
   for (auto dir : auth_pinned_dirfrags) {
     (void)dir;
     items_dir[i].item_dir.remove_myself();