From 67371827b6ddd34053998a2a246db13377d92c4e Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Mon, 15 Jun 2020 10:48:35 -0700 Subject: [PATCH] crimson/os/seastore/cached_extent: make apply_delta take a const bl Signed-off-by: Samuel Just --- src/crimson/os/seastore/cached_extent.h | 2 +- .../os/seastore/lba_manager/btree/lba_btree_node_impl.h | 4 ++-- .../os/seastore/onode_manager/simple-fltree/onode_block.cc | 2 +- .../os/seastore/onode_manager/simple-fltree/onode_block.h | 2 +- src/crimson/os/seastore/root_block.h | 2 +- src/test/crimson/seastore/test_block.h | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/crimson/os/seastore/cached_extent.h b/src/crimson/os/seastore/cached_extent.h index d85da1011b9a..680f9970cbf2 100644 --- a/src/crimson/os/seastore/cached_extent.h +++ b/src/crimson/os/seastore/cached_extent.h @@ -133,7 +133,7 @@ public: * match. Implementation should mutate buffer based on bl. base matches * the address passed on_delta_write. */ - virtual void apply_delta(paddr_t base, ceph::bufferlist &bl) = 0; + virtual void apply_delta(paddr_t base, const ceph::bufferlist &bl) = 0; /** * Called on dirty CachedExtent implementation after replay. diff --git a/src/crimson/os/seastore/lba_manager/btree/lba_btree_node_impl.h b/src/crimson/os/seastore/lba_manager/btree/lba_btree_node_impl.h index 9d419a4138be..66d85220326e 100644 --- a/src/crimson/os/seastore/lba_manager/btree/lba_btree_node_impl.h +++ b/src/crimson/os/seastore/lba_manager/btree/lba_btree_node_impl.h @@ -169,7 +169,7 @@ struct LBAInternalNode return ceph::bufferlist(); } - void apply_delta(paddr_t delta_base, ceph::bufferlist &bl) final { + void apply_delta(paddr_t delta_base, const ceph::bufferlist &bl) final { ceph_assert(0 == "TODO"); } @@ -371,7 +371,7 @@ struct LBALeafNode return ceph::bufferlist(); } - void apply_delta(paddr_t delta_base, ceph::bufferlist &bl) final { + void apply_delta(paddr_t delta_base, const ceph::bufferlist &bl) final { ceph_assert(0 == "TODO"); } diff --git a/src/crimson/os/seastore/onode_manager/simple-fltree/onode_block.cc b/src/crimson/os/seastore/onode_manager/simple-fltree/onode_block.cc index 996626365e38..d0d10747c3af 100644 --- a/src/crimson/os/seastore/onode_manager/simple-fltree/onode_block.cc +++ b/src/crimson/os/seastore/onode_manager/simple-fltree/onode_block.cc @@ -26,7 +26,7 @@ void OnodeBlock::on_delta_write(paddr_t) apply_pending_changes(true); } -void OnodeBlock::apply_delta(paddr_t, ceph::bufferlist &bl) +void OnodeBlock::apply_delta(paddr_t, const ceph::bufferlist &bl) { assert(deltas.empty()); diff --git a/src/crimson/os/seastore/onode_manager/simple-fltree/onode_block.h b/src/crimson/os/seastore/onode_manager/simple-fltree/onode_block.h index 1c15064dc4b8..38a8424ebe0a 100644 --- a/src/crimson/os/seastore/onode_manager/simple-fltree/onode_block.h +++ b/src/crimson/os/seastore/onode_manager/simple-fltree/onode_block.h @@ -46,7 +46,7 @@ struct OnodeBlock final : LogicalCachedExtent { ceph::bufferlist get_delta() final; void on_initial_write() final; void on_delta_write(paddr_t record_block_offset) final; - void apply_delta(paddr_t base, ceph::bufferlist &bl) final; + void apply_delta(paddr_t base, const ceph::bufferlist &bl) final; void sync() { apply_pending_changes(false); diff --git a/src/crimson/os/seastore/root_block.h b/src/crimson/os/seastore/root_block.h index 35fe075031b2..72c0ab969138 100644 --- a/src/crimson/os/seastore/root_block.h +++ b/src/crimson/os/seastore/root_block.h @@ -88,7 +88,7 @@ struct RootBlock : CachedExtent { return ceph::bufferlist(); } - void apply_delta(paddr_t base, ceph::bufferlist &bl) final { + void apply_delta(paddr_t base, const ceph::bufferlist &bl) final { ceph_assert(0 == "TODO"); } diff --git a/src/test/crimson/seastore/test_block.h b/src/test/crimson/seastore/test_block.h index 3277511bc47d..2e9a91e4c314 100644 --- a/src/test/crimson/seastore/test_block.h +++ b/src/test/crimson/seastore/test_block.h @@ -61,7 +61,7 @@ struct TestBlock : crimson::os::seastore::LogicalCachedExtent { return { get_length(), get_crc32c(1) }; } - void apply_delta(paddr_t delta_base, ceph::bufferlist &bl) final { + void apply_delta(paddr_t delta_base, const ceph::bufferlist &bl) final { ceph_assert(0 == "TODO"); } }; -- 2.47.3