update sources to 12.2.2

[ceph.git] / ceph / src / journal / ObjectPlayer.cc

diff --git a/ceph/src/journal/ObjectPlayer.cc b/ceph/src/journal/ObjectPlayer.cc
index 92dd702615bcd018e749bb5e56fdce688bc98018..8292ebb1abfcb5801fed45ee62df2eceb87fd1c4 100644 (file)
--- a/ceph/src/journal/ObjectPlayer.cc
+++ b/ceph/src/journal/ObjectPlayer.cc
@@ -234,9 +234,12 @@ void ObjectPlayer::schedule_watch() {
   }
 
   ldout(m_cct, 20) << __func__ << ": " << m_oid << " scheduling watch" << dendl;
-  assert(m_watch_task == NULL);
-  m_watch_task = new C_WatchTask(this);
-  m_timer.add_event_after(m_watch_interval, m_watch_task);
+  assert(m_watch_task == nullptr);
+  m_watch_task = m_timer.add_event_after(
+    m_watch_interval,
+    new FunctionContext([this](int) {
+       handle_watch_task();
+      }));
 }
 
 bool ObjectPlayer::cancel_watch() {
@@ -301,10 +304,6 @@ void ObjectPlayer::C_Fetch::finish(int r) {
   on_finish->complete(r);
 }
 
-void ObjectPlayer::C_WatchTask::finish(int r) {
-  object_player->handle_watch_task();
-}
-
 void ObjectPlayer::C_WatchFetch::finish(int r) {
   object_player->handle_watch_fetched(r);
 }