From: Xiubo Li <xiubli@redhat.com>
Date: Tue, 25 Aug 2020 04:33:48 +0000 (-0400)
Subject: osdc/Journaler: do not call onsafe->complete() if onsafe is 0
X-Git-Tag: v16.1.0~1261^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f923f9572a4f5fe1dff3ac3af3c4cb2cb2035113;p=ceph.git

osdc/Journaler: do not call onsafe->complete() if onsafe is 0

Fixes: https://tracker.ceph.com/issues/47125
Signed-off-by: Xiubo Li <xiubli@redhat.com>
---

diff --git a/src/osdc/Journaler.cc b/src/osdc/Journaler.cc
index a26d3e96029b..5c00293e6645 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));