mds: drop unused projected dirfrag_t arg for EMetaBlob::add_primary_dentry

Not used.  If it is later, we need to project it properly.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 60b6d3aaf2827dcd33060b1f56ea346ae607929d..e82e3d660d7e89426e6de6949d3b486d4ecc35da 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -1521,7 +1521,7 @@ void MDCache::journal_cow_dentry(Mutation *mut, EMetaBlob *metablob, CDentry *dn
       CDentry *olddn = dn->dir->add_primary_dentry(dn->name, oldin, oldfirst, follows);
       oldin->inode.version = olddn->pre_dirty();
       dout(10) << " olddn " << *olddn << dendl;
-      metablob->add_primary_dentry(olddn, true, 0, 0);
+      metablob->add_primary_dentry(olddn, true, 0);
       mut->add_cow_dentry(olddn);
     } else {
       assert(dnl->is_remote());

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index b9a097eeea61deb348161796fd8806a4d80b178a..8ac4c17e0551c5ac9da9990d1eff18a0b0b77cf1 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -4549,7 +4549,7 @@ void Server::_unlink_local(MDRequest *mdr, CDentry *dn, CDentry *straydn)
     // project snaprealm, too
     in->project_past_snaprealm_parent(straydn->get_dir()->inode->find_snaprealm());
 
-    le->metablob.add_primary_dentry(straydn, true, in, 0);
+    le->metablob.add_primary_dentry(straydn, true, in);
   } else {
     // remote link.  update remote inode.
     mdcache->predirty_journal_parents(mdr, &le->metablob, in, dn->get_dir(), PREDIRTY_DIR, -1);
@@ -5626,7 +5626,7 @@ void Server::_rename_prepare(MDRequest *mdr,
        // project snaprealm, too
        oldin->project_past_snaprealm_parent(straydn->get_dir()->inode->find_snaprealm());
        straydn->first = MAX(oldin->first, next_dest_snap);
-       tji = metablob->add_primary_dentry(straydn, true, oldin, 0);
+       tji = metablob->add_primary_dentry(straydn, true, oldin);
       }
     } else if (destdnl->is_remote()) {
       if (oldin->is_auth()) {
@@ -5677,11 +5677,11 @@ void Server::_rename_prepare(MDRequest *mdr,
       destdn->first = MAX(destdn->first, next_dest_snap);
 
     if (destdn->is_auth())
-      ji = metablob->add_primary_dentry(destdn, true, srci, 0);
+      ji = metablob->add_primary_dentry(destdn, true, srci);
     else if (force_journal) {
       dout(10) << " forced journaling destdn " << *destdn << dendl;
       metablob->add_dir_context(destdn->get_dir());
-      ji = metablob->add_primary_dentry(destdn, true, srci, 0);
+      ji = metablob->add_primary_dentry(destdn, true, srci);
     }
   }
     

diff --git a/src/mds/events/EMetaBlob.h b/src/mds/events/EMetaBlob.h
index c790a2243d9f44eb422f084c2a2aa9f8360e9a1c..8c0c3ff44176c0afddd07a0affe8188554970626 100644 (file)
--- a/src/mds/events/EMetaBlob.h
+++ b/src/mds/events/EMetaBlob.h
@@ -532,12 +532,12 @@ private:
 
   // return remote pointer to to-be-journaled inode
   inode_t *add_primary_dentry(CDentry *dn, bool dirty, 
-                             CInode *in=0, fragtree_t *pdft=0) {
+                             CInode *in=0) {
     return add_primary_dentry(add_dir(dn->get_dir(), false),
-                              dn, dirty, in, pdft);
+                              dn, dirty, in);
   }
   inode_t *add_primary_dentry(dirlump& lump, CDentry *dn, bool dirty, 
-                             CInode *in=0, fragtree_t *pdft=0) {
+                             CInode *in=0) {
     if (!in) 
       in = dn->get_projected_linkage()->get_inode();
 
@@ -552,9 +552,6 @@ private:
                            in->get_projected_node()->dir_layout :
                            in->default_layout);
 
-    if (!pdft)
-      pdft = &in->dirfragtree;
-
     bufferlist snapbl;
     sr_t *sr = in->get_projected_srnode();
     if (sr)
@@ -564,7 +561,7 @@ private:
     lump.get_dfull().push_back(std::tr1::shared_ptr<fullbit>(new fullbit(dn->get_name(), 
                                                                         dn->first, dn->last,
                                                                         dn->get_projected_version(), 
-                                                                        *pi, *pdft,
+                                                                        *pi, in->dirfragtree,
                                                                         *in->get_projected_xattrs(),
                                                                         in->symlink, snapbl,
                                                                         dirty, default_layout)));