Revert "multi-mds/link: Reverse link primary inode to hardlink"

This reverts commit 18165365fe6e5af985c0bb9c7eaa6b5c276c5d3b.

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

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 01b82987ebb0d346b7dc47eb47ce56812540e2b1..b4e3b93c0b1a6af5427e31104340b2b26aa3332c 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -7915,12 +7915,6 @@ void Server::_link_remote(const MDRequestRef& mdr, bool inc, CDentry *dn, CInode
     auto req = make_message<MMDSPeerRequest>(mdr->reqid, mdr->attempt, op);
     targeti->set_object_info(req->get_object_info());
     req->op_stamp = mdr->get_op_stamp();
-    if (mds->mdsmap->allow_referent_inodes()) {
-      if (inc && newi)
-        req->referent_ino = newi->ino();
-    } else {
-      req->referent_ino = inodeno_t(0);
-    }
 
     if (auto& desti_srnode = mdr->more()->desti_srnode)
       encode(*desti_srnode, req->desti_snapbl);
@@ -8096,7 +8090,6 @@ void Server::handle_peer_link_prep(const MDRequestRef& mdr)
   bool inc;
   bool adjust_realm = false;
   bool realm_projected = false;
-  inodeno_t referent_ino = mdr->peer_request->referent_ino;
   if (mdr->peer_request->get_op() == MMDSPeerRequest::OP_LINKPREP) {
     inc = true;
     pi.inode->nlink++;
@@ -8110,12 +8103,6 @@ void Server::handle_peer_link_prep(const MDRequestRef& mdr)
       adjust_realm = true;
       realm_projected = true;
     }
-    // Reverse link referent inode to the primary inode (targeti)
-    if (referent_ino > 0) {
-      pi.inode->add_referent_ino(referent_ino);
-      dout(20) << __func__ <<  " referent_inodes " << std::hex << pi.inode->get_referent_inodes()
-               << " referent ino added " << referent_ino << dendl;
-    }
   } else {
     inc = false;
     pi.inode->nlink--;

diff --git a/src/messages/MMDSPeerRequest.h b/src/messages/MMDSPeerRequest.h
index 4b13ebfca67d31d71998293eb759fa912c0bf232..1799ab361a11587cac19e4d0c2c4bb40a06d1bb6 100644 (file)
--- a/src/messages/MMDSPeerRequest.h
+++ b/src/messages/MMDSPeerRequest.h
@@ -20,7 +20,7 @@
 #include "messages/MMDSOp.h"
 
 class MMDSPeerRequest final : public MMDSOp {
-  static constexpr int HEAD_VERSION = 2;
+  static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
 public:
   static constexpr int OP_XLOCK =       1;
@@ -129,7 +129,6 @@ public:
   ceph::buffer::list srci_snapbl;
   ceph::buffer::list desti_snapbl;
 
-  inodeno_t referent_ino; //referent inode
 public:
   metareqid_t get_reqid() const { return reqid; }
   __u32 get_attempt() const { return attempt; }
@@ -195,7 +194,6 @@ public:
     encode(srci_snapbl, payload);
     encode(desti_snapbl, payload);
     encode(alternate_name, payload);
-    encode(referent_ino, payload);
   }
   void decode_payload() override {
     using ceph::decode;
@@ -218,8 +216,6 @@ public:
     decode(srci_snapbl, p);
     decode(desti_snapbl, p);
     decode(alternate_name, p);
-    if (header.version >= 2)
-      decode(referent_ino, p);
   }
 
   std::string_view get_type_name() const override { return "peer_request"; }