From 0fb06f8bc972c880e894ac86354e4daf5130ba6d Mon Sep 17 00:00:00 2001 From: Igor Fedotov Date: Thu, 20 Mar 2025 20:36:29 +0300 Subject: [PATCH] os/bluestore: rename bluefs_super_t::version -> seq Signed-off-by: Igor Fedotov (cherry picked from commit 4130c43d50e6cbd7697b57753f1a889528912334) --- src/os/bluestore/BlueFS.cc | 10 +++++----- src/os/bluestore/bluefs_types.cc | 12 ++++++------ src/os/bluestore/bluefs_types.h | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc index 9ed06c094500e..baa312d308215 100644 --- a/src/os/bluestore/BlueFS.cc +++ b/src/os/bluestore/BlueFS.cc @@ -688,7 +688,7 @@ int BlueFS::mkfs(uuid_d osd_uuid, const bluefs_layout_t& layout) _init_logger(); - super.version = 0; + super.seq = 0; super.block_size = bdev[BDEV_DB]->get_block_size(); super.osd_uuid = osd_uuid; super.uuid.generate_random(); @@ -1201,20 +1201,20 @@ int BlueFS::fsck() int BlueFS::_write_super(int dev) { - ++super.version; + ++super.seq; // build superblock bufferlist bl; encode(super, bl); uint32_t crc = bl.crc32c(-1); encode(crc, bl); dout(10) << __func__ << " super block length(encoded): " << bl.length() << dendl; - dout(10) << __func__ << " superblock " << super.version << dendl; + dout(10) << __func__ << " superblock " << super.seq << dendl; dout(10) << __func__ << " log_fnode " << super.log_fnode << dendl; ceph_assert_always(bl.length() <= get_super_length()); bl.append_zero(get_super_length() - bl.length()); bdev[dev]->write(get_super_offset(), bl, false, WRITE_LIFE_SHORT); - dout(20) << __func__ << " v " << super.version + dout(20) << __func__ << " seq " << super.seq << " crc 0x" << std::hex << crc << " offset 0x" << get_super_offset() << std::dec << dendl; @@ -1249,7 +1249,7 @@ int BlueFS::_open_super() << dendl; return -EIO; } - dout(10) << __func__ << " superblock " << super.version << dendl; + dout(10) << __func__ << " superblock " << super.seq << dendl; dout(10) << __func__ << " log_fnode " << super.log_fnode << dendl; return 0; } diff --git a/src/os/bluestore/bluefs_types.cc b/src/os/bluestore/bluefs_types.cc index 0ba3a70d2e9ff..82428a09b47c3 100644 --- a/src/os/bluestore/bluefs_types.cc +++ b/src/os/bluestore/bluefs_types.cc @@ -74,7 +74,7 @@ void bluefs_layout_t::generate_test_instances(list& ls) } // bluefs_super_t -bluefs_super_t::bluefs_super_t() : version(0), block_size(4096) { +bluefs_super_t::bluefs_super_t() : seq(0), block_size(4096) { } void bluefs_super_t::encode(bufferlist& bl) const @@ -82,7 +82,7 @@ void bluefs_super_t::encode(bufferlist& bl) const ENCODE_START(2, 1, bl); encode(uuid, bl); encode(osd_uuid, bl); - encode(version, bl); + encode(seq, bl); encode(block_size, bl); encode(log_fnode, bl); encode(memorized_layout, bl); @@ -94,7 +94,7 @@ void bluefs_super_t::decode(bufferlist::const_iterator& p) DECODE_START(2, p); decode(uuid, p); decode(osd_uuid, p); - decode(version, p); + decode(seq, p); decode(block_size, p); decode(log_fnode, p); if (struct_v >= 2) { @@ -107,7 +107,7 @@ void bluefs_super_t::dump(Formatter *f) const { f->dump_stream("uuid") << uuid; f->dump_stream("osd_uuid") << osd_uuid; - f->dump_unsigned("version", version); + f->dump_unsigned("seq", seq); f->dump_unsigned("block_size", block_size); f->dump_object("log_fnode", log_fnode); } @@ -116,7 +116,7 @@ void bluefs_super_t::generate_test_instances(list& ls) { ls.push_back(new bluefs_super_t); ls.push_back(new bluefs_super_t); - ls.back()->version = 1; + ls.back()->seq = 1; ls.back()->block_size = 4096; } @@ -124,7 +124,7 @@ ostream& operator<<(ostream& out, const bluefs_super_t& s) { return out << "super(uuid " << s.uuid << " osd " << s.osd_uuid - << " v " << s.version + << " seq " << s.seq << " block_size 0x" << std::hex << s.block_size << " log_fnode 0x" << s.log_fnode << std::dec << ")"; diff --git a/src/os/bluestore/bluefs_types.h b/src/os/bluestore/bluefs_types.h index 2d293d2a9ee4e..3c2cff02bf33c 100644 --- a/src/os/bluestore/bluefs_types.h +++ b/src/os/bluestore/bluefs_types.h @@ -213,7 +213,7 @@ WRITE_CLASS_ENCODER(bluefs_layout_t) struct bluefs_super_t { uuid_d uuid; ///< unique to this bluefs instance uuid_d osd_uuid; ///< matches the osd that owns us - uint64_t version; ///< In fact that's update counter + uint64_t seq; ///< sequence counter uint32_t block_size; bluefs_fnode_t log_fnode; -- 2.39.5