From: Yingxin Cheng Date: Wed, 18 Dec 2024 08:23:16 +0000 (+0800) Subject: crimson/os/seastore/cache: drop unused backref_entry_t::seq X-Git-Tag: testing/wip-vshankar-testing-20241227.162501-debug~7^2~10 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8091f31810634066ecc6800a858030a51bef8000;p=ceph-ci.git crimson/os/seastore/cache: drop unused backref_entry_t::seq Signed-off-by: Yingxin Cheng --- diff --git a/src/crimson/os/seastore/async_cleaner.cc b/src/crimson/os/seastore/async_cleaner.cc index cecdb985532..341c5c5524a 100644 --- a/src/crimson/os/seastore/async_cleaner.cc +++ b/src/crimson/os/seastore/async_cleaner.cc @@ -1142,8 +1142,7 @@ SegmentCleaner::do_reclaim_space( pin->get_key(), pin->get_val(), pin->get_length(), - pin->get_type(), - JOURNAL_SEQ_NULL); + pin->get_type()); } for (auto &cached_backref : cached_backref_entries) { if (cached_backref.laddr == L_ADDR_NULL) { diff --git a/src/crimson/os/seastore/cache.cc b/src/crimson/os/seastore/cache.cc index cdd9c542d95..c2808909b12 100644 --- a/src/crimson/os/seastore/cache.cc +++ b/src/crimson/os/seastore/cache.cc @@ -32,8 +32,7 @@ std::ostream &operator<<(std::ostream &out, const backref_entry_t &ent) { return out << "backref_entry_t{" << ent.paddr << "~0x" << std::hex << ent.len << std::dec << ", " << "laddr: " << ent.laddr << ", " - << "type: " << ent.type << ", " - << "seq: " << ent.seq << ", " + << "type: " << ent.type << "}"; } @@ -1697,8 +1696,7 @@ void Cache::complete_commit( ? i->cast()->get_node_meta().begin : L_ADDR_NULL), i->get_length(), - i->get_type(), - start_seq)); + i->get_type())); } else if (is_backref_node(i->get_type())) { add_backref_extent( i->get_paddr(), @@ -1762,8 +1760,7 @@ void Cache::complete_commit( extent->get_paddr(), L_ADDR_NULL, extent->get_length(), - extent->get_type(), - start_seq)); + extent->get_type())); } else if (is_backref_node(extent->get_type())) { remove_backref_extent(extent->get_paddr()); } else { @@ -1795,8 +1792,7 @@ void Cache::complete_commit( i->get_paddr(), i->cast()->get_laddr(), i->get_length(), - i->get_type(), - start_seq)); + i->get_type())); add_extent(i); const auto t_src = t.get_src(); if (i->is_dirty()) { @@ -1944,8 +1940,7 @@ Cache::replay_delta( alloc_blk.paddr, alloc_blk.laddr, alloc_blk.len, - alloc_blk.type, - journal_seq)); + alloc_blk.type)); } if (!backref_list.empty()) { backref_batch_update(std::move(backref_list), journal_seq); diff --git a/src/crimson/os/seastore/cache.h b/src/crimson/os/seastore/cache.h index 07647f6c7cf..7cd496ce150 100644 --- a/src/crimson/os/seastore/cache.h +++ b/src/crimson/os/seastore/cache.h @@ -43,13 +43,11 @@ struct backref_entry_t { const paddr_t paddr, const laddr_t laddr, const extent_len_t len, - const extent_types_t type, - const journal_seq_t seq) + const extent_types_t type) : paddr(paddr), laddr(laddr), len(len), - type(type), - seq(seq) + type(type) {} backref_entry_t(alloc_blk_t alloc_blk) : paddr(alloc_blk.paddr), @@ -62,7 +60,6 @@ struct backref_entry_t { extent_len_t len = 0; extent_types_t type = extent_types_t::ROOT; - journal_seq_t seq; friend bool operator< ( const backref_entry_t &l, const backref_entry_t &r) { @@ -984,7 +981,7 @@ private: for (auto it = start_iter; it != end_iter; it++) { - res.emplace(it->paddr, it->laddr, it->len, it->type, it->seq); + res.emplace(it->paddr, it->laddr, it->len, it->type); } return res; }