Revert "mds: Referent hardlink Recovery - Store remote_inode"

This reverts commit 97650eeef18c4ed03fc266001cace98bbc6f8d8a.

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

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index 01fd41fa6587277e90330afcfc4b98ea6e22bb05..3fe8ea2d273e5f5f7bd879e33a1eb82fd941316f 100644 (file)
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -84,12 +84,6 @@ void CInodeCommitOperation::update(ObjectOperation &op, inode_backtrace_t &bt) {
     encode(_symlink, symlink_bl);
     op.setxattr("symlink", symlink_bl);
   }
-
-  if (remote_inode) {
-    bufferlist remote_inode_bl;
-    encode(remote_inode, remote_inode_bl);
-    op.setxattr("remote_inode", remote_inode_bl);
-  }
 }
 
 class CInodeIOContext : public MDSIOContextBase
@@ -1456,12 +1450,8 @@ void CInode::_store_backtrace(std::vector<CInodeCommitOperation> &ops_vec,
     slink = symlink;
   }
 
-  inodeno_t remote_inode = 0;
-  if (is_referent_remote())
-    remote_inode = get_remote_ino();
-
   ops_vec.emplace_back(op_prio, pool, get_inode()->layout,
-                       mdcache->mds->mdsmap->get_up_features(), slink, remote_inode);
+                       mdcache->mds->mdsmap->get_up_features(), slink);
 
   if (!state_test(STATE_DIRTYPOOL) || get_inode()->old_pools.empty() || ignore_old_pools) {
     dout(20) << __func__ << ": no dirtypool or no old pools or ignore_old_pools" << dendl;

diff --git a/src/mds/CInode.h b/src/mds/CInode.h
index bddba4c7f1990596376169cb980139e6d560fa00..90c55883f6495fdc8e5a8b9ee3978a540aa9c68b 100644 (file)
--- a/src/mds/CInode.h
+++ b/src/mds/CInode.h
@@ -73,8 +73,8 @@ public:
   CInodeCommitOperation(int prio, int64_t po)
     : pool(po), priority(prio) {
   }
-  CInodeCommitOperation(int prio, int64_t po, file_layout_t l, uint64_t f, std::string_view s, inodeno_t ri)
-    : pool(po), priority(prio), _layout(l), _features(f), _symlink(s), remote_inode(ri) {
+  CInodeCommitOperation(int prio, int64_t po, file_layout_t l, uint64_t f, std::string_view s)
+    : pool(po), priority(prio), _layout(l), _features(f), _symlink(s) {
       update_layout_symlink = true;
   }
 
@@ -88,7 +88,6 @@ private:
   file_layout_t _layout;
   uint64_t _features;
   std::string_view _symlink;
-  inodeno_t remote_inode;     // real inode of the referent inode
 };
 
 struct CInodeCommitOperations {