From 606939cbf2e81cafbec2197594ce621ce09b9f80 Mon Sep 17 00:00:00 2001 From: Joseph Sawaya Date: Thu, 3 Feb 2022 11:49:25 -0500 Subject: [PATCH] crimson/os/seastore: change segment_off_t to seastore_off_t Signed-off-by: Joseph Sawaya --- src/crimson/os/seastore/segment_manager/zns.cc | 6 +++--- src/crimson/os/seastore/segment_manager/zns.h | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/crimson/os/seastore/segment_manager/zns.cc b/src/crimson/os/seastore/segment_manager/zns.cc index a9a4ef00d1a07..ec8ac278c9dbb 100644 --- a/src/crimson/os/seastore/segment_manager/zns.cc +++ b/src/crimson/os/seastore/segment_manager/zns.cc @@ -490,7 +490,7 @@ SegmentManager::read_ertr::future<> ZNSSegmentManager::read( } Segment::close_ertr::future<> ZNSSegmentManager::segment_close( - segment_id_t id, segment_off_t write_pointer) + segment_id_t id, seastore_off_t write_pointer) { return seastar::do_with( blk_zone_range{}, @@ -558,7 +558,7 @@ magic_t ZNSSegmentManager::get_magic() const return metadata.magic; }; -segment_off_t ZNSSegment::get_write_capacity() const +seastore_off_t ZNSSegment::get_write_capacity() const { return manager.get_segment_size(); } @@ -577,7 +577,7 @@ Segment::close_ertr::future<> ZNSSegment::close() } Segment::write_ertr::future<> ZNSSegment::write( - segment_off_t offset, ceph::bufferlist bl) + seastore_off_t offset, ceph::bufferlist bl) { if (offset < write_pointer || offset % manager.metadata.block_size != 0) { logger().error( diff --git a/src/crimson/os/seastore/segment_manager/zns.h b/src/crimson/os/seastore/segment_manager/zns.h index 0bb804373c903..064711187c463 100644 --- a/src/crimson/os/seastore/segment_manager/zns.h +++ b/src/crimson/os/seastore/segment_manager/zns.h @@ -68,17 +68,17 @@ namespace crimson::os::seastore::segment_manager::zns { ZNSSegment(ZNSSegmentManager &man, segment_id_t i) : manager(man), id(i){}; segment_id_t get_segment_id() const final { return id; } - segment_off_t get_write_capacity() const final; - segment_off_t get_write_ptr() const final { return write_pointer; } + seastore_off_t get_write_capacity() const final; + seastore_off_t get_write_ptr() const final { return write_pointer; } close_ertr::future<> close() final; - write_ertr::future<> write(segment_off_t offset, ceph::bufferlist bl) final; + write_ertr::future<> write(seastore_off_t offset, ceph::bufferlist bl) final; ~ZNSSegment() {} private: friend class ZNSSegmentManager; ZNSSegmentManager &manager; const segment_id_t id; - segment_off_t write_pointer = 0; + seastore_off_t write_pointer = 0; }; class ZNSSegmentManager final : public SegmentManager{ @@ -99,11 +99,11 @@ namespace crimson::os::seastore::segment_manager::zns { return metadata.size; }; - segment_off_t get_block_size() const final { + seastore_off_t get_block_size() const final { return metadata.block_size; }; - segment_off_t get_segment_size() const final { + seastore_off_t get_segment_size() const final { return metadata.segment_size; }; @@ -162,7 +162,7 @@ namespace crimson::os::seastore::segment_manager::zns { seastar::metrics::metric_group metrics; Segment::close_ertr::future<> segment_close( - segment_id_t id, segment_off_t write_pointer); + segment_id_t id, seastore_off_t write_pointer); uint64_t get_offset(paddr_t addr) { auto& seg_addr = addr.as_seg_paddr(); -- 2.39.5