From 6273c2ffef8e0caf9de2fda2b3e1e3c59e14b4cb Mon Sep 17 00:00:00 2001 From: myoungwon oh Date: Thu, 7 Dec 2017 16:32:32 +0900 Subject: [PATCH] osd: use stop_block() if the object is blocked This commit prevents double free in finish_flush() (stop_block() -> cancel_flush()) Signed-off-by: Myoungwon Oh --- src/osd/PrimaryLogPG.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc index 32f542fe56a..76ccae05a66 100644 --- a/src/osd/PrimaryLogPG.cc +++ b/src/osd/PrimaryLogPG.cc @@ -9851,7 +9851,7 @@ void PrimaryLogPG::cancel_flush(FlushOpRef fop, bool requeue) p.second = 0; } } - if (fop->blocking) { + if (fop->blocking && fop->obc->is_blocked()) { fop->obc->stop_block(); kick_object_context_blocked(fop->obc); } -- 2.39.5