Skip to content

Commit 9f23d74

Browse files
committed
crimson/os/seastore/onode_manager: use laddr_le_t in laddr_packed_t
laddr_t is no longer POD type after changing it to struct, use laddr_le_t instead Signed-off-by: Zhang Song <[email protected]>
1 parent fb2358c commit 9f23d74

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ class NodeLayoutT final : public InternalNodeImpl, public LeafNodeImpl {
375375
auto value_ptr = node_stage.get_end_p_laddr();
376376
int offset = reinterpret_cast<const char*>(value_ptr) - p_start;
377377
os << "\n tail value: "
378-
<< value_ptr->value
378+
<< laddr_t(value_ptr->value)
379379
<< " " << size << "B"
380380
<< " @" << offset << "B";
381381
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ inline std::ostream& operator<<(std::ostream &os, const node_type_t& type) {
4444
}
4545

4646
struct laddr_packed_t {
47-
laddr_t value;
47+
laddr_le_t value;
4848
} __attribute__((packed));
4949
inline std::ostream& operator<<(std::ostream& os, const laddr_packed_t& laddr) {
50-
return os << "laddr_packed(" << laddr.value << ")";
50+
return os << "laddr_packed(" << laddr_t(laddr.value) << ")";
5151
}
5252

5353
using match_stat_t = int8_t;

src/crimson/os/seastore/onode_manager/staged-fltree/stages/stage.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1443,7 +1443,7 @@ struct staged {
14431443
if constexpr (NODE_TYPE == node_type_t::LEAF) {
14441444
os << *value_ptr;
14451445
} else {
1446-
os << value_ptr->value;
1446+
os << laddr_t(value_ptr->value);
14471447
}
14481448
os << " " << size << "B"
14491449
<< " @" << offset << "B";

src/crimson/os/seastore/onode_manager/staged-fltree/stages/sub_items_stage.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const laddr_packed_t* internal_sub_items_t::insert_at(
2222

2323
auto p_insert = const_cast<char*>(p_shift_end) - size;
2424
auto item = internal_sub_item_t{
25-
snap_gen_t::from_key(key), laddr_packed_t{value}};
25+
snap_gen_t::from_key(key), laddr_packed_t{laddr_le_t{value}}};
2626
mut.copy_in_absolute(p_insert, item);
2727
return &reinterpret_cast<internal_sub_item_t*>(p_insert)->value;
2828
}
@@ -79,7 +79,7 @@ void internal_sub_items_t::Appender<KT>::append(
7979
{
8080
p_append -= sizeof(internal_sub_item_t);
8181
auto item = internal_sub_item_t{
82-
snap_gen_t::from_key(key), laddr_packed_t{value}};
82+
snap_gen_t::from_key(key), laddr_packed_t{laddr_le_t{value}}};
8383
p_mut->copy_in_absolute(p_append, item);
8484
p_value = &reinterpret_cast<internal_sub_item_t*>(p_append)->value;
8585
}

0 commit comments

Comments
 (0)