From c16371965cc785f2e2b87d8c6684854fa2de65e1 Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Sun, 6 May 2018 11:11:16 +0800
Subject: [PATCH] osdc: guard op->on_notify_finish with lock

Fixes: http://tracker.ceph.com/issues/23966
Signed-off-by: Kefu Chai <kchai@redhat.com>
---
 src/osdc/Objecter.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 20d5b682e9030..67378542033f3 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -1654,6 +1654,7 @@ void Objecter::_check_linger_pool_dne(LingerOp *op, bool *need_unregister)
   }
   if (op->map_dne_bound > 0) {
     if (osdmap->get_epoch() >= op->map_dne_bound) {
+      LingerOp::unique_lock wl{op->watch_lock};
       if (op->on_reg_commit) {
 	op->on_reg_commit->complete(-ENOENT);
 	op->on_reg_commit = nullptr;
-- 
2.39.5