mds: rename project_past_parent -> project_past_snaprealm_parent

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index e290cefc44e8c77fb7bb9728dc33d16b4f439491..029797f63a736d85e2335ac1629e4f0a3212ab7c 100644 (file)
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -264,7 +264,7 @@ sr_t *CInode::project_snaprealm(snapid_t snapid)
 
 /* if newparent != parent, add parent to past_parents
  if parent DNE, we need to find what the parent actually is and fill that in */
-void CInode::project_past_parent(SnapRealm *newparent, bufferlist& snapbl)
+void CInode::project_past_snaprealm_parent(SnapRealm *newparent, bufferlist& snapbl)
 {
   sr_t *new_snap = project_snaprealm();
   SnapRealm *oldparent;

diff --git a/src/mds/CInode.h b/src/mds/CInode.h
index 02d139411acfd4fb93d5c9a68c36473304a2354c..3758a03114452d4191b5563603af0138f7624bbd 100644 (file)
--- a/src/mds/CInode.h
+++ b/src/mds/CInode.h
@@ -273,7 +273,7 @@ public:
     }
     return &snaprealm->srnode;
   }
-  void project_past_parent(SnapRealm *newparent, bufferlist& snapbl);
+  void project_past_snaprealm_parent(SnapRealm *newparent, bufferlist& snapbl);
 
 private:
   void pop_projected_snaprealm(sr_t *next_snaprealm);

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 2975c82ae97539ac257c8fabdfde3d0e6a7c6df6..09d471e401aa0c2e198af12ef12384d2c6c0e52f 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -4067,7 +4067,7 @@ void Server::_unlink_local(MDRequest *mdr, CDentry *dn, CDentry *straydn)
 
     // project snaprealm, too
     bufferlist snapbl;
-    in->project_past_parent(straydn->get_dir()->inode->find_snaprealm(), snapbl);
+    in->project_past_snaprealm_parent(straydn->get_dir()->inode->find_snaprealm(), snapbl);
 
     le->metablob.add_primary_dentry(straydn, true, in, 0, &snapbl);
   } else {
@@ -4796,7 +4796,7 @@ void Server::_rename_prepare(MDRequest *mdr,
     if (destdnl->is_primary()) {
       // project snaprealm, too
       bufferlist snapbl;
-      destdnl->get_inode()->project_past_parent(straydn->get_dir()->inode->find_snaprealm(), snapbl);
+      destdnl->get_inode()->project_past_snaprealm_parent(straydn->get_dir()->inode->find_snaprealm(), snapbl);
       straydn->first = destdnl->get_inode()->first;  // XXX hmm, is this right?
       tji = metablob->add_primary_dentry(straydn, true, destdnl->get_inode(), 0, &snapbl);
     } else if (destdnl->is_remote()) {
@@ -4827,7 +4827,7 @@ void Server::_rename_prepare(MDRequest *mdr,
     // project snap parent update?
     bufferlist snapbl;
     if (destdn->is_auth() && srcdnl->get_inode()->snaprealm)
-      srcdnl->get_inode()->project_past_parent(destdn->get_dir()->inode->find_snaprealm(), snapbl);
+      srcdnl->get_inode()->project_past_snaprealm_parent(destdn->get_dir()->inode->find_snaprealm(), snapbl);
     
     if (!destdnl->is_null())
       mdcache->journal_cow_dentry(mdr, metablob, destdn, CEPH_NOSNAP, 0, destdnl);