From b0e2964ac8a8f3a273046ab8e87a62c1bc4db55c Mon Sep 17 00:00:00 2001 From: Adam Kupczyk Date: Sun, 29 Nov 2020 04:05:01 -0500 Subject: [PATCH] os/bluestore: Only pass that decremented nref to 0 deletes object Signed-off-by: Adam Kupczyk --- src/os/bluestore/BlueStore.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index 9a7cc2e4aec3..da74d1800507 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -3478,7 +3478,8 @@ void BlueStore::Onode::get() { } } void BlueStore::Onode::put() { - if (--nref == 2) { + int n = --nref; + if (n == 2) { c->get_onode_cache()->unpin(this, [&]() { bool was_pinned = pinned; pinned = pinned && nref > 2; // intentionally use > not >= as we have @@ -3486,12 +3487,12 @@ void BlueStore::Onode::put() { bool r = was_pinned && !pinned; // additional decrement for newly unpinned instance if (r) { - --nref; + n = --nref; } return cached && r; }); } - if (nref == 0) { + if (n == 0) { delete this; } } -- 2.47.3