From f923f9572a4f5fe1dff3ac3af3c4cb2cb2035113 Mon Sep 17 00:00:00 2001 From: Xiubo Li Date: Tue, 25 Aug 2020 00:33:48 -0400 Subject: [PATCH] osdc/Journaler: do not call onsafe->complete() if onsafe is 0 Fixes: https://tracker.ceph.com/issues/47125 Signed-off-by: Xiubo Li --- src/osdc/Journaler.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/osdc/Journaler.cc b/src/osdc/Journaler.cc index a26d3e96029..5c00293e664 100644 --- a/src/osdc/Journaler.cc +++ b/src/osdc/Journaler.cc @@ -704,7 +704,8 @@ void Journaler::wait_for_flush(Context *onsafe) { lock_guard l(lock); if (is_stopping()) { - onsafe->complete(-EAGAIN); + if (onsafe) + onsafe->complete(-EAGAIN); return; } _wait_for_flush(onsafe); @@ -737,7 +738,8 @@ void Journaler::flush(Context *onsafe) { lock_guard l(lock); if (is_stopping()) { - onsafe->complete(-EAGAIN); + if (onsafe) + onsafe->complete(-EAGAIN); return; } _flush(wrap_finisher(onsafe)); -- 2.47.3