From 00d1d6f507f5c95fa5438940bb57809ab751bdc9 Mon Sep 17 00:00:00 2001 From: Venky Shankar Date: Tue, 18 Mar 2025 09:07:38 +0000 Subject: [PATCH] Revert "mds: Store list of hardlinks on the inode of primary link" This reverts commit 7822a588e8ef9f61bc37b5d48ff323194ad57f6d. Signed-off-by: Venky Shankar --- src/include/cephfs/dump.h | 5 ----- src/include/cephfs/json.h | 1 - src/include/cephfs/types.h | 13 +------------ 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/src/include/cephfs/dump.h b/src/include/cephfs/dump.h index 1baceff59ef..b87a2f7af88 100644 --- a/src/include/cephfs/dump.h +++ b/src/include/cephfs/dump.h @@ -96,11 +96,6 @@ void inode_t::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 c0720ffdce8..b9936292ebb 100644 --- a/src/include/cephfs/json.h +++ b/src/include/cephfs/json.h @@ -76,5 +76,4 @@ void inode_t::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 9d86eb4a2de..de45ca2aa6b 100644 --- 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& 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; inodeno_t remote_ino = 0; // referent inode - remote inode link - std::vector referent_inodes; private: bool older_is_consistent(const inode_t &other) const; @@ -1060,8 +1053,6 @@ void inode_t::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::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::compare(const inode_t &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; -- 2.47.3