Revert "mds: Hardlink referent inode plumbing work"

This reverts commit b9947bacdfd3cbedcf7a6b93af471c40f3a9c65b.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 5b73801441a21bca9268a5c0410edf89978a7ba2)

diff --git a/src/mds/CDentry.cc b/src/mds/CDentry.cc
index 7fdb4d4a67dbf95050a3634b78abf7ec36aaa9e8..a04ee3bbcb373ccaebf97eb979abb0621d90fcc1 100644 (file)
--- a/src/mds/CDentry.cc
+++ b/src/mds/CDentry.cc
@@ -52,8 +52,8 @@ CDentry::CDentry(std::string_view n, __u32 h,
 
 CDentry::CDentry(std::string_view n, __u32 h,
                 mempool::mds_co::string alternate_name,
-                inodeno_t ino, inodeno_t referent_ino,
-                unsigned char dt, snapid_t f, snapid_t l) :
+                inodeno_t ino, unsigned char dt,
+                snapid_t f, snapid_t l) :
   hash(h),
   first(f), last(l),
   item_dirty(this),
@@ -64,7 +64,6 @@ CDentry::CDentry(std::string_view n, __u32 h,
 {
   linkage.remote_ino = ino;
   linkage.remote_d_type = dt;
-  linkage.referent_ino = referent_ino;
 }
 
 CDentry::~CDentry() {
@@ -303,19 +302,14 @@ void CDentry::make_path(filepath& fp, bool projected) const
  * active (no longer projected).  if the passed dnl is projected,
  * don't link in, and do that work later in pop_projected_linkage().
  */
-void CDentry::link_remote(CDentry::linkage_t *dnl, CInode *remote_in, CInode *referent_in)
+void CDentry::link_remote(CDentry::linkage_t *dnl, CInode *in)
 {
-  ceph_assert(dnl->is_remote() || dnl->is_referent_remote());
-  ceph_assert(remote_in->ino() == dnl->get_remote_ino());
-  dnl->inode = remote_in;
-
-  if (referent_in) {
-    dnl->referent_inode = referent_in;
-    dnl->referent_ino = referent_in->ino();
-  }
+  ceph_assert(dnl->is_remote());
+  ceph_assert(in->ino() == dnl->get_remote_ino());
+  dnl->inode = in;
 
   if (dnl == &linkage)
-    remote_in->add_remote_parent(this);
+    in->add_remote_parent(this);
 
   // check for reintegration
   dir->mdcache->eval_remote(this);
@@ -323,7 +317,7 @@ void CDentry::link_remote(CDentry::linkage_t *dnl, CInode *remote_in, CInode *re
 
 void CDentry::unlink_remote(CDentry::linkage_t *dnl)
 {
-  ceph_assert(dnl->is_remote() || dnl->is_referent_remote());
+  ceph_assert(dnl->is_remote());
   ceph_assert(dnl->inode);
   
   if (dnl == &linkage)
@@ -343,20 +337,6 @@ void CDentry::push_projected_linkage()
   }
 }
 
-void CDentry::push_projected_linkage(CInode *referent_inode, inodeno_t remote_ino, inodeno_t referent_ino)
-{
-  ceph_assert(remote_ino);
-  ceph_assert(referent_inode);
-  ceph_assert(referent_ino);
-
-  linkage_t *p = _project_linkage();
-  p->referent_inode = referent_inode;
-  referent_inode->push_projected_parent(this);
-  p->referent_ino = referent_ino;
-
-  p->remote_ino = remote_ino;
-  p->remote_d_type = referent_inode->d_type();
-}
 
 void CDentry::push_projected_linkage(CInode *inode)
 {
@@ -390,19 +370,12 @@ CDentry::linkage_t *CDentry::pop_projected_linkage()
    * much).
    */
 
-  if (n.is_remote()) {
+  if (n.remote_ino) {
     dir->link_remote_inode(this, n.remote_ino, n.remote_d_type);
     if (n.inode) {
       linkage.inode = n.inode;
       linkage.inode->add_remote_parent(this);
     }
-  } else if (n.is_referent_remote()){
-    dir->link_referent_inode(this, n.referent_inode, n.remote_ino, n.remote_d_type);
-    if (n.inode) {
-      linkage.inode = n.inode;
-      linkage.inode->add_remote_parent(this);
-    }
-    n.referent_inode->pop_projected_parent();
   } else {
     if (n.inode) {
       dir->link_primary_inode(this, n.inode);

diff --git a/src/mds/CDentry.h b/src/mds/CDentry.h
index 07766fbaf78ab8900609d08677f466d31efd7a0f..7b3756214e8e385ce316bedfc50440eef496b3e7 100644 (file)
--- a/src/mds/CDentry.h
+++ b/src/mds/CDentry.h
@@ -80,26 +80,20 @@ public:
     CInode *inode = nullptr;
     inodeno_t remote_ino = 0;
     unsigned char remote_d_type = 0;
-    CInode *referent_inode = nullptr;
-    inodeno_t referent_ino = 0;
     
     linkage_t() {}
 
     // dentry type is primary || remote || null
     // inode ptr is required for primary, optional for remote, undefined for null
     bool is_primary() const { return remote_ino == 0 && inode != 0; }
-    bool is_remote() const { return remote_ino > 0 && referent_inode == nullptr && referent_ino == 0; }
-    bool is_null() const { return remote_ino == 0 && inode == 0 && referent_ino == 0 && referent_inode == nullptr; }
-    bool is_referent_remote() const {return remote_ino > 0 && referent_ino != 0 && referent_inode != nullptr;}
+    bool is_remote() const { return remote_ino > 0; }
+    bool is_null() const { return remote_ino == 0 && inode == 0; }
 
     CInode *get_inode() { return inode; }
     const CInode *get_inode() const { return inode; }
     inodeno_t get_remote_ino() const { return remote_ino; }
     unsigned char get_remote_d_type() const { return remote_d_type; }
     std::string get_remote_d_type_string() const;
-    CInode *get_referent_inode() { return referent_inode; }
-    const CInode *get_referent_inode() const { return referent_inode; }
-    inodeno_t get_referent_ino() const { return referent_ino; }
 
     void set_remote(inodeno_t ino, unsigned char d_type) {
       remote_ino = ino;
@@ -135,8 +129,8 @@ public:
          snapid_t f, snapid_t l);
   CDentry(std::string_view n, __u32 h,
           mempool::mds_co::string alternate_name,
-          inodeno_t ino, inodeno_t referent_ino,
-         unsigned char dt, snapid_t f, snapid_t l);
+          inodeno_t ino, unsigned char dt,
+          snapid_t f, snapid_t l);
 
   ~CDentry() override;
 
@@ -195,7 +189,6 @@ public:
     p->remote_d_type = d_type;
   }
   void push_projected_linkage(CInode *inode); 
-  void push_projected_linkage(CInode *referent_inode, inodeno_t remote_ino, inodeno_t referent_ino);
   linkage_t *pop_projected_linkage();
 
   bool is_projected() const { return !projected.empty(); }
@@ -243,7 +236,7 @@ public:
   int get_num_dir_auth_pins() const;
   
   // remote links
-  void link_remote(linkage_t *dnl, CInode *remote_in, CInode *ref_in=nullptr);
+  void link_remote(linkage_t *dnl, CInode *in);
   void unlink_remote(linkage_t *dnl);
   
   // copy cons

diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc
index aee723022f77df07cfa525329203422828b29ad8..976bf4d947040501f0a9c26e967ccdd0f6a3f3f4 100644 (file)
--- a/src/mds/CDir.cc
+++ b/src/mds/CDir.cc
@@ -469,18 +469,15 @@ CDentry* CDir::add_primary_dentry(std::string_view dname, CInode *in,
   return dn;
 }
 
-// This also adds referent remote if referent inode is passed
-CDentry* CDir::add_remote_dentry(std::string_view dname, CInode *ref_in, inodeno_t ino,
-                                 unsigned char d_type, mempool::mds_co::string alternate_name,
+CDentry* CDir::add_remote_dentry(std::string_view dname, inodeno_t ino, unsigned char d_type,
+                                 mempool::mds_co::string alternate_name,
                                 snapid_t first, snapid_t last) 
 {
   // foreign
   ceph_assert(lookup_exact_snap(dname, last) == 0);
 
-  inodeno_t referent_ino = ref_in ? ref_in->ino() : inodeno_t(0);
-
   // create dentry
-  CDentry* dn = new CDentry(dname, inode->hash_dentry_name(dname), std::move(alternate_name), ino, referent_ino, d_type, first, last);
+  CDentry* dn = new CDentry(dname, inode->hash_dentry_name(dname), std::move(alternate_name), ino, d_type, first, last);
   dn->dir = this;
   dn->version = get_projected_version();
   dn->check_corruption(true);
@@ -493,13 +490,6 @@ CDentry* CDir::add_remote_dentry(std::string_view dname, CInode *ref_in, inodeno
   //assert(null_items.count(dn->get_name()) == 0);
 
   items[dn->key()] = dn;
-
-  //link referent inode
-  if (ref_in) {
-    dn->get_linkage()->referent_inode = ref_in;
-    link_inode_work(dn, ref_in);
-  }
-
   if (last == CEPH_NOSNAP)
     num_head_items++;
   else
@@ -598,64 +588,6 @@ void CDir::link_remote_inode(CDentry *dn, inodeno_t ino, unsigned char d_type)
   ceph_assert(get_num_any() == items.size());
 }
 
-void CDir::link_null_referent_inode(CDentry *dn, inodeno_t referent_ino, inodeno_t rino, unsigned char d_type)
-{
-  dout(12) << __func__ << " " << *dn << " referent_ino " << referent_ino << " remote " << rino << dendl;
-  ceph_assert(dn->get_linkage()->is_null());
-
-  dn->get_linkage()->set_remote(rino, d_type);
-  dn->get_linkage()->referent_ino = referent_ino;
-}
-
-/*
- * The linking fun - It can be done in following different ways
- *   1. add_remote_dentry()
- *           - single step, if referent CInode is available and dentry needs to be created.
- *   2. link_referent_inode()
- *           - if referent CInode is available and dentry needs to be created, usually in
- *           referent inode creation phase.
- *           e.g., pop_projected_linkage() preceded by push_projected_linkage()
- *   3. add_null_dentry() -> link_referent_inode()
- *           - two step, if referent CInode is not available and dentry needs to be created,
- *           usually in journal replay.
- *   4. link_null_referent_inode() -> link_referent_inode()
- *           - two step, if referent CInode is not available and dentry exists, usually in
- *           migration.
- *           e.g., decode_replica_dentry() followed by decode_replica_inode()
- */
-void CDir::link_referent_inode(CDentry *dn, CInode *ref_in, inodeno_t rino, unsigned char d_type)
-{
-  ceph_assert(ref_in);
-  dout(12) << __func__ << " " << *dn << " remote " << rino << " referent inode " << *ref_in << dendl;
-
-  // The link_referent_inode could be called after add_null_dentry or link_null_referent_inode.
-  // So linkage need not be always null
-  ceph_assert(dn->get_linkage()->is_null() || dn->get_linkage()->get_referent_ino() > 0);
-  ceph_assert(!dn->get_linkage()->get_referent_inode());
-
-  // set linkage
-  dn->get_linkage()->set_remote(rino, d_type);
-  dn->get_linkage()->referent_inode = ref_in;
-  dn->get_linkage()->referent_ino = ref_in->ino();
-
-  link_inode_work(dn, ref_in);
-
-  if (dn->state_test(CDentry::STATE_BOTTOMLRU)) {
-    mdcache->bottom_lru.lru_remove(dn);
-    mdcache->lru.lru_insert_mid(dn);
-    dn->state_clear(CDentry::STATE_BOTTOMLRU);
-  }
-
-  if (dn->last == CEPH_NOSNAP) {
-    num_head_items++;
-    num_head_null--;
-  } else {
-    num_snap_items++;
-    num_snap_null--;
-  }
-  ceph_assert(get_num_any() == items.size());
-}
-
 void CDir::link_primary_inode(CDentry *dn, CInode *in)
 {
   dout(12) << __func__ << " " << *dn << " " << *in << dendl;
@@ -685,7 +617,7 @@ void CDir::link_primary_inode(CDentry *dn, CInode *in)
 
 void CDir::link_inode_work( CDentry *dn, CInode *in)
 {
-  ceph_assert(dn->get_linkage()->get_inode() == in || dn->get_linkage()->get_referent_inode() == in);
+  ceph_assert(dn->get_linkage()->get_inode() == in);
   in->set_primary_parent(dn);
 
   // set inode version
@@ -780,35 +712,6 @@ void CDir::unlink_inode_work(CDentry *dn)
       dn->unlink_remote(dn->get_linkage());
 
     dn->get_linkage()->set_remote(0, 0);
-  } else if(dn->get_linkage()->is_referent_remote()) {
-      // referent remote
-      CInode *ref_in = dn->get_linkage()->get_referent_inode();
-
-      if (ref_in->get_num_ref())
-        dn->put(CDentry::PIN_INODEPIN);
-
-      if (ref_in->state_test(CInode::STATE_TRACKEDBYOFT))
-        mdcache->open_file_table.notify_unlink(ref_in);
-      if (ref_in->is_any_caps())
-        adjust_num_inodes_with_caps(-1);
-
-      // unlink auth_pin count
-      if (ref_in->auth_pins)
-        dn->adjust_nested_auth_pins(-ref_in->auth_pins, nullptr);
-
-      if (ref_in->is_freezing_inode())
-        ref_in->item_freezing_inode.remove_myself();
-      else if (ref_in->is_frozen_inode() || ref_in->is_frozen_auth_pin())
-        num_frozen_inodes--;
-
-      // detach inode
-      ref_in->remove_primary_parent(dn);
-      if (in)
-        dn->unlink_remote(dn->get_linkage());
-
-      dn->get_linkage()->set_remote(0, 0);
-      dn->get_linkage()->referent_inode = 0;
-      dn->get_linkage()->referent_ino = 0;
   } else if (dn->get_linkage()->is_primary()) {
     // primary
     // unpin dentry?
@@ -1970,7 +1873,7 @@ CDentry *CDir::_load_dentry(
       }
     } else {
       // (remote) link
-      dn = add_remote_dentry(dname, nullptr, ino, d_type, std::move(alternate_name), first, last);
+      dn = add_remote_dentry(dname, ino, d_type, std::move(alternate_name), first, last);
 
       // link to inode?
       CInode *in = mdcache->get_inode(ino);   // we may or may not have it.

diff --git a/src/mds/CDir.h b/src/mds/CDir.h
index d39b03e48919395051d7fcd39446d74acf401ac4..fb5d71bb792f2ce7e713151fb15bb18dbb0a142f 100644 (file)
--- a/src/mds/CDir.h
+++ b/src/mds/CDir.h
@@ -383,15 +383,13 @@ public:
                           snapid_t first=2, snapid_t last=CEPH_NOSNAP);
   CDentry* add_primary_dentry(std::string_view dname, CInode *in, mempool::mds_co::string alternate_name,
                              snapid_t first=2, snapid_t last=CEPH_NOSNAP);
-  CDentry* add_remote_dentry(std::string_view dname, CInode *ref_in, inodeno_t ino,
-                             unsigned char d_type, mempool::mds_co::string alternate_name,
+  CDentry* add_remote_dentry(std::string_view dname, inodeno_t ino, unsigned char d_type,
+                             mempool::mds_co::string alternate_name,
                             snapid_t first=2, snapid_t last=CEPH_NOSNAP);
   void remove_dentry( CDentry *dn );         // delete dentry
   void link_remote_inode( CDentry *dn, inodeno_t ino, unsigned char d_type);
   void link_remote_inode( CDentry *dn, CInode *in );
   void link_primary_inode( CDentry *dn, CInode *in );
-  void link_null_referent_inode(CDentry *dn, inodeno_t referent_ino, inodeno_t rino, unsigned char d_type);
-  void link_referent_inode(CDentry *dn, CInode *in, inodeno_t ino, unsigned char d_type);
   void unlink_inode(CDentry *dn, bool adjust_lru=true);
   void try_remove_unlinked_dn(CDentry *dn);
 

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 66d1d48096a442f2773504b7c461c41d39a197e3..a1493e760e8c53ffc1b5aee67021949ffca32508 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -1696,8 +1696,7 @@ void MDCache::journal_cow_dentry(MutationImpl *mut, EMetaBlob *metablob,
        dn->first = dir_follows+1;
        if (realm->has_snaps_in_range(oldfirst, dir_follows)) {
          CDir *dir = dn->dir;
-          // TODO: What does this mean for referent inode ?? Passing nullptr for now.
-         CDentry *olddn = dir->add_remote_dentry(dn->get_name(), nullptr, in->ino(), in->d_type(), dn->alternate_name, oldfirst, dir_follows);
+         CDentry *olddn = dir->add_remote_dentry(dn->get_name(), in->ino(), in->d_type(), dn->alternate_name, oldfirst, dir_follows);
          dout(10) << " olddn " << *olddn << dendl;
          ceph_assert(dir->is_projected());
          olddn->set_projected_version(dir->get_projected_version());
@@ -1783,8 +1782,7 @@ void MDCache::journal_cow_dentry(MutationImpl *mut, EMetaBlob *metablob,
       mut->add_cow_dentry(olddn);
     } else {
       ceph_assert(dnl->is_remote());
-      //No need to journal referent inode for cow
-      CDentry *olddn = dir->add_remote_dentry(dn->get_name(), nullptr, dnl->get_remote_ino(), dnl->get_remote_d_type(), dn->alternate_name, oldfirst, follows);
+      CDentry *olddn = dir->add_remote_dentry(dn->get_name(), dnl->get_remote_ino(), dnl->get_remote_d_type(), dn->alternate_name, oldfirst, follows);
       dout(10) << " olddn " << *olddn << dendl;
 
       olddn->set_projected_version(dir->get_projected_version());
@@ -4833,8 +4831,7 @@ void MDCache::handle_cache_rejoin_strong(const cref_t<MMDSCacheRejoin> &strong)
         }
         if (!dn) {
          if (d.is_remote()) {
-           //TODO: Fix for referent remote
-           dn = dir->add_remote_dentry(ss.name, nullptr, d.remote_ino, d.remote_d_type, mempool::mds_co::string(d.alternate_name), d.first, ss.snapid);
+           dn = dir->add_remote_dentry(ss.name, d.remote_ino, d.remote_d_type, mempool::mds_co::string(d.alternate_name), d.first, ss.snapid);
          } else if (d.is_null()) {
            dn = dir->add_null_dentry(ss.name, d.first, ss.snapid);
          } else {

diff --git a/src/mds/journal.cc b/src/mds/journal.cc
index adbce2e213ebc493d471e644cae5fd96ec7f8c9f..dea1e2714a5a0cbc9e983978fda2317c9f457d4b 100644 (file)
--- a/src/mds/journal.cc
+++ b/src/mds/journal.cc
@@ -1441,8 +1441,7 @@ void EMetaBlob::replay(MDSRank *mds, LogSegment *logseg, int type, MDPeerUpdate
     for (const auto& rb : lump.get_dremote()) {
       CDentry *dn = dir->lookup_exact_snap(rb.dn, rb.dnlast);
       if (!dn) {
-       //TODO: Fix for referent inodes
-       dn = dir->add_remote_dentry(rb.dn, nullptr, rb.ino, rb.d_type, mempool::mds_co::string(rb.alternate_name), rb.dnfirst, rb.dnlast);
+       dn = dir->add_remote_dentry(rb.dn, rb.ino, rb.d_type, mempool::mds_co::string(rb.alternate_name), rb.dnfirst, rb.dnlast);
        dn->set_version(rb.dnv);
        if (rb.dirty) dn->_mark_dirty(logseg);
        dout(10) << "EMetaBlob.replay added " << *dn << dendl;