Skip to content

Commit 459b79a

Browse files
authored
Merge pull request ceph#55872 from aclamk/wip-aclamk-bs-fix-unused
os/bluestore: Mute warnings Reviewed-by: Igor Fedotov <[email protected]>
2 parents e6363cc + 4acd7be commit 459b79a

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

src/os/bluestore/bluefs_types.cc

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -228,21 +228,15 @@ std::ostream& operator<<(std::ostream& out, const bluefs_fnode_delta_t& delta)
228228

229229
// bluefs_transaction_t
230230

231-
DENC_HELPERS
232231
void bluefs_transaction_t::bound_encode(size_t &s) const {
233-
uint32_t crc = op_bl.crc32c(-1);
234-
DENC_START(1, 1, s);
232+
uint32_t crc = -1;
233+
s += 1; // version
234+
s += 1; // compat
235+
s += 4; // size
235236
denc(uuid, s);
236-
denc_varint(seq, s);
237-
// not using bufferlist encode method, as it merely copies the bufferptr and not
238-
// contents, meaning we're left with fragmented target bl
239-
__u32 len = op_bl.length();
240-
denc(len, s);
241-
for (auto& it : op_bl.buffers()) {
242-
s += it.length();
243-
}
237+
denc(seq, s);
238+
denc(op_bl, s);
244239
denc(crc, s);
245-
DENC_FINISH(s);
246240
}
247241

248242
void bluefs_transaction_t::encode(bufferlist& bl) const

0 commit comments

Comments
 (0)