Skip to content

Commit 9050368

Browse files
committed
crimson/os/seastore/onode_manager: adapt block aligned laddr_t
Use laddr_offset_t as parameter for ValueDeltaRecorder, since the payload offset may not be block aligned. Signed-off-by: Zhang Song <[email protected]>
1 parent a97269f commit 9050368

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/crimson/os/seastore/onode_manager/staged-fltree/fltree_onode_manager.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace crimson::os::seastore::onode {
1212
void FLTreeOnode::Recorder::apply_value_delta(
1313
ceph::bufferlist::const_iterator &bliter,
1414
NodeExtentMutable &value,
15-
laddr_t value_addr)
15+
laddr_offset_t value_addr_offset)
1616
{
1717
LOG_PREFIX(FLTreeOnode::Recorder::apply_value_delta);
1818
delta_op_t op;

src/crimson/os/seastore/onode_manager/staged-fltree/fltree_onode_manager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ struct FLTreeOnode final : Onode, Value {
6666
void apply_value_delta(
6767
ceph::bufferlist::const_iterator &bliter,
6868
NodeExtentMutable &value,
69-
laddr_t value_addr) final;
69+
laddr_offset_t value_addr_offset) final;
7070

7171
void encode_update(NodeExtentMutable &payload_mut, delta_op_t op);
7272
};

src/crimson/os/seastore/onode_manager/staged-fltree/value.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ class ValueDeltaRecorder {
141141
/// Called by DeltaRecorderT to apply user-defined value delta.
142142
virtual void apply_value_delta(ceph::bufferlist::const_iterator&,
143143
NodeExtentMutable&,
144-
laddr_t) = 0;
144+
laddr_offset_t) = 0;
145145

146146
protected:
147147
ValueDeltaRecorder(ceph::bufferlist& encoded) : encoded{encoded} {}

src/test/crimson/seastore/onode_tree/test_value.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ class TestValue final : public Value {
137137

138138
void apply_value_delta(ceph::bufferlist::const_iterator& delta,
139139
NodeExtentMutable& payload_mut,
140-
laddr_t value_addr) override {
140+
laddr_offset_t value_addr_offset) override {
141141
delta_op_t op;
142142
try {
143143
ceph::decode(op, delta);
@@ -160,12 +160,12 @@ class TestValue final : public Value {
160160
}
161161
default:
162162
logger().error("OTree::TestValue::Replay: got unknown op {} when replay {}~{:#x}",
163-
op, value_addr, payload_mut.get_length());
163+
op, value_addr_offset, payload_mut.get_length());
164164
ceph_abort();
165165
}
166166
} catch (buffer::error& e) {
167167
logger().error("OTree::TestValue::Replay: got decode error {} when replay {}~{:#x}",
168-
e.what(), value_addr, payload_mut.get_length());
168+
e.what(), value_addr_offset, payload_mut.get_length());
169169
ceph_abort();
170170
}
171171
}

0 commit comments

Comments
 (0)