RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-17 00:12:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

crimson/os/seastore/object_data_handler: don't return empty buffers from split_pin*

Browse Source 
Always return std::nullopt rather than an empty buffer -- this way users
can rely on this as an invariant.

Signed-off-by: Samuel Just <sjust@redhat.com>
This commit is contained in:
Samuel Just 2022-04-08 02:20:49 -07:00 committed by chunmei-liu
parent 76e9262efb
commit 88319b475f
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/crimson/os/seastore/object_data_handler.cc
View File

@ -177,7 +177,10 @@ split_ret split_pin_left(context_t ctx, LBAPinRef &pin, laddr_t offset)
(zero_extent_len == 0
? std::nullopt
: std::make_optional(extent_to_write_t(pin_offset, zero_extent_len))),
bufferptr(ceph::buffer::create(zero_prepend_len, 0))
(zero_prepend_len == 0
? std::nullopt
: std::make_optional(
bufferptr(ceph::buffer::create(zero_prepend_len, 0))))
);
} else {
// Data, return up to offset to prepend
@ -213,7 +216,10 @@ split_ret split_pin_right(context_t ctx, LBAPinRef &pin, laddr_t end)
(zero_extent_len == 0
? std::nullopt
: std::make_optional(extent_to_write_t(aligned_end, zero_extent_len))),
bufferptr(ceph::buffer::create(zero_suffix_len, 0))
(zero_suffix_len == 0
? std::nullopt
: std::make_optional(
bufferptr(ceph::buffer::create(zero_suffix_len, 0))))
);
} else {
return read_pin(ctx, pin->duplicate()