From 7c80fcdae0af1ae5d39217b9b3fd75b9ca6762df Mon Sep 17 00:00:00 2001
From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Mon, 15 Mar 2021 11:54:22 +0000
Subject: [PATCH] crimson/osd: s/do_timeout/do_notify_timeout/ per the upcoming
 do_watch_timeout().

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---
 src/crimson/osd/watch.cc | 2 +-
 src/crimson/osd/watch.h  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/crimson/osd/watch.cc b/src/crimson/osd/watch.cc
index 5639eca060933..bdceaf68682a8 100644
--- a/src/crimson/osd/watch.cc
+++ b/src/crimson/osd/watch.cc
@@ -209,7 +209,7 @@ seastar::future<> Notify::send_completion(
   return conn->send(std::move(reply));
 }
 
-void Notify::do_timeout()
+void Notify::do_notify_timeout()
 {
   logger().debug("{} complete={}", __func__, complete);
   if (complete) {
diff --git a/src/crimson/osd/watch.h b/src/crimson/osd/watch.h
index 5ad1f05d898d6..cc58d93903156 100644
--- a/src/crimson/osd/watch.h
+++ b/src/crimson/osd/watch.h
@@ -116,7 +116,7 @@ class Notify : public seastar::enable_shared_from_this<Notify> {
   bool complete{false};
   bool discarded{false};
   seastar::timer<seastar::lowres_clock> timeout_timer{
-    [this] { do_timeout(); }
+    [this] { do_notify_timeout(); }
   };
 
   /// (gid,cookie) -> reply_bl for everyone who acked the notify
@@ -129,7 +129,7 @@ class Notify : public seastar::enable_shared_from_this<Notify> {
     std::set<WatchRef> timedout_watchers = {});
 
   /// Called on Notify timeout
-  void do_timeout();
+  void do_notify_timeout();
 
   Notify(crimson::net::ConnectionRef conn,
          const notify_info_t& ninfo,
-- 
2.39.5