From e656aac1a4490c8c1ed305486a2dfe56052419a8 Mon Sep 17 00:00:00 2001 From: Igor Fedotov Date: Tue, 16 Apr 2019 14:28:43 +0300 Subject: [PATCH] os/bluestore: fix improper backport for p2 macros for bmap alocator Fixes: 3244c871f36ee22ee826a96f30e82a8d05c9170c This caused TestAllocatorLevel01.test_4G_alloc_bugN to fail in mimic. Signed-off-by: Igor Fedotov --- src/os/bluestore/fastbmap_allocator_impl.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/os/bluestore/fastbmap_allocator_impl.cc b/src/os/bluestore/fastbmap_allocator_impl.cc index 415a2fd7a9722..a486876f8cef0 100755 --- a/src/os/bluestore/fastbmap_allocator_impl.cc +++ b/src/os/bluestore/fastbmap_allocator_impl.cc @@ -23,7 +23,7 @@ inline interval_t _align2units(uint64_t offset, uint64_t len, uint64_t min_lengt auto delta_off = res.offset - offset; if (len > delta_off) { res.length = len - delta_off; - res.length = p2align(res.length, min_length); + res.length = p2align(res.length, min_length); if (res.length) { return res; } @@ -189,7 +189,7 @@ void AllocatorLevel01Loose::_analyze_partials(uint64_t pos_start, (ctx->min_affordable_len == 0 || (longest.length < ctx->min_affordable_len))) { - ctx->min_affordable_len = p2align(longest.length, min_length); + ctx->min_affordable_len = p2align(longest.length, min_length); ctx->min_affordable_offs = longest.offset; } if (mode == STOP_ON_PARTIAL) { -- 2.39.5