Revert "mds: Store list of hardlinks on the inode of primary link"

This reverts commit 7822a588e8ef9f61bc37b5d48ff323194ad57f6d.

Signed-off-by: Venky Shankar <vshankar@redhat.com>

diff --git a/src/include/cephfs/dump.h b/src/include/cephfs/dump.h
index 1baceff59ef644db21e58c4693c533647bfe860f..b87a2f7af8853a672353eac7959d7b2f84d247c9 100644 (file)
--- a/src/include/cephfs/dump.h
+++ b/src/include/cephfs/dump.h
@@ -96,11 +96,6 @@ void inode_t<Allocator>::dump(ceph::Formatter *f) const
   f->dump_stream("last_scrub_stamp") << last_scrub_stamp;
   f->dump_unsigned("last_scrub_version", last_scrub_version);
   f->dump_unsigned("remote_ino", remote_ino);
-  f->open_array_section("referent_inodes");
-  for (const auto &ri : referent_inodes) {
-    f->dump_unsigned("referent_inode", ri);
-  }
-  f->close_section();
 }
 
 inline void vinodeno_t::dump(ceph::Formatter *f) const {

diff --git a/src/include/cephfs/json.h b/src/include/cephfs/json.h
index c0720ffdce85a48bcc700d04687608f003abab1c..b9936292ebbdcac4da2abdb25a72fc084dd6c3a3 100644 (file)
--- a/src/include/cephfs/json.h
+++ b/src/include/cephfs/json.h
@@ -76,5 +76,4 @@ void inode_t<Allocator>::decode_json(JSONObj *obj)
   JSONDecoder::decode_json("last_scrub_stamp", last_scrub_stamp, obj, true);
   JSONDecoder::decode_json("last_scrub_version", last_scrub_version, obj, true);
   JSONDecoder::decode_json("remote_ino", remote_ino.val, obj, true);
-  JSONDecoder::decode_json("referent_inodes", referent_inodes, obj, true);
 }

diff --git a/src/include/cephfs/types.h b/src/include/cephfs/types.h
index 9d86eb4a2de0bf094af6c8ac4878c5b15e8cb5ee..de45ca2aa6ba68da5ae639015cc2b0edd25cc8ac 100644 (file)
--- a/src/include/cephfs/types.h
+++ b/src/include/cephfs/types.h
@@ -864,12 +864,6 @@ struct inode_t {
     optmetadata.del_opt(optmetadata_singleton_server_t::kind_t::CHARMAP);
   }
 
-  const std::vector<uint64_t>& get_referent_inodes() { return referent_inodes; }
-  void add_referent_ino(inodeno_t ref_ino) { referent_inodes.push_back(ref_ino); }
-  void remove_referent_ino(inodeno_t ref_ino) {
-    referent_inodes.erase(remove(referent_inodes.begin(), referent_inodes.end(), ref_ino), referent_inodes.end());
-  }
-
   void encode(ceph::buffer::list &bl, uint64_t features) const;
   void decode(ceph::buffer::list::const_iterator& bl);
   void dump(ceph::Formatter *f) const;
@@ -975,7 +969,6 @@ struct inode_t {
   optmetadata_multiton<optmetadata_singleton_server_t,Allocator> optmetadata;
 
   inodeno_t remote_ino = 0; // referent inode - remote inode link
-  std::vector<uint64_t> referent_inodes;
 
 private:
   bool older_is_consistent(const inode_t &other) const;
@@ -1060,8 +1053,6 @@ void inode_t<Allocator>::encode(ceph::buffer::list &bl, uint64_t features) const
   encode(optmetadata, bl, features);
 
   encode(remote_ino, bl);
-  encode(referent_inodes, bl);
-
   ENCODE_FINISH(bl);
 }
 
@@ -1186,7 +1177,6 @@ void inode_t<Allocator>::decode(ceph::buffer::list::const_iterator &p)
 
   if (struct_v >= 21) {
     decode(remote_ino, p);
-    decode(referent_inodes, p);
   }
   DECODE_FINISH(p);
 }
@@ -1240,8 +1230,7 @@ int inode_t<Allocator>::compare(const inode_t<Allocator> &other, bool *divergent
        fscrypt_file != other.fscrypt_file ||
        fscrypt_last_block != other.fscrypt_last_block ||
        optmetadata != other.optmetadata ||
-       remote_ino != other.remote_ino ||
-       referent_inodes != other.referent_inodes) {
+       remote_ino != other.remote_ino) {
       *divergent = true;
     }
     return 0;