From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 2 May 2017 20:11:42 +0000 (-0400)
Subject: mds: use clearer name for export pin cont
X-Git-Tag: v12.0.3~38^2~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f1508caa65f5887b0e7b2bf5f9910cc9d16119dd;p=ceph.git

mds: use clearer name for export pin cont

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index bbe8b7f99676..e9edb0675d63 100644
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -4391,12 +4391,12 @@ int64_t CInode::get_backtrace_pool() const
   }
 }
 
-class C_CInode_AuxSubtree : public MDSInternalContext {
+class C_CInode_ExportPin : public MDSInternalContext {
 public:
-  explicit C_CInode_AuxSubtree(CInode *in) : MDSInternalContext(in->mdcache->mds), in(in) {
+  explicit C_CInode_ExportPin(CInode *in) : MDSInternalContext(in->mdcache->mds), in(in) {
     in->get(MDSCacheObject::PIN_PTRWAITER);
   }
-  ~C_CInode_AuxSubtree() {
+  ~C_CInode_ExportPin() {
     in->put(MDSCacheObject::PIN_PTRWAITER);
   }
 
@@ -4445,12 +4445,12 @@ void CInode::maybe_export_pin()
           CDir *subtree = mdcache->get_subtree_root(cd);
           if (!subtree) continue;
           if (subtree->is_ambiguous_auth()) {
-            subtree->add_waiter(MDSCacheObject::WAIT_SINGLEAUTH, new C_CInode_AuxSubtree(this));
+            subtree->add_waiter(MDSCacheObject::WAIT_SINGLEAUTH, new C_CInode_ExportPin(this));
             dout(15) << "delaying pinning for single auth on subtree " << *subtree << dendl;
           } else if (subtree->is_auth()) {
             assert(cd->is_auth());
             if (subtree->is_frozen() || subtree->is_freezing()) {
-              subtree->add_waiter(MDSCacheObject::WAIT_UNFREEZE, new C_CInode_AuxSubtree(this));
+              subtree->add_waiter(MDSCacheObject::WAIT_UNFREEZE, new C_CInode_ExportPin(this));
               dout(15) << "delaying pinning for thaw on subtree " << *subtree << dendl;
             } else {
               cd->state_set(CDir::STATE_AUXSUBTREE);
diff --git a/src/mds/CInode.h b/src/mds/CInode.h
index b05d843a87bc..85324882bfa7 100644
--- a/src/mds/CInode.h
+++ b/src/mds/CInode.h
@@ -648,7 +648,7 @@ public:
   friend class StrayManager;
   friend class CDir;
   friend class CInodeExport;
-  friend class C_CInode_AuxSubtree;
+  friend class C_CInode_ExportPin;
 
   // ---------------------------
   CInode(MDCache *c, bool auth=true, snapid_t f=2, snapid_t l=CEPH_NOSNAP) :