From: Yingxin Cheng <yingxin.cheng@intel.com>
Date: Tue, 22 Aug 2023 03:23:47 +0000 (+0800)
Subject: crimson/common/operation: cleanup, drop the unused PipelineExitBarrierI::cancel()
X-Git-Tag: v19.0.0~141^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f59a0dad06b11ad248e1c5a9c30ed919c40d7263;p=ceph.git

crimson/common/operation: cleanup, drop the unused PipelineExitBarrierI::cancel()

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
---

diff --git a/src/crimson/common/operation.h b/src/crimson/common/operation.h
index 6df2c99fd2a0..b0ac033a8cd3 100644
--- a/src/crimson/common/operation.h
+++ b/src/crimson/common/operation.h
@@ -478,13 +478,10 @@ public:
   /// Waits for exit barrier
   virtual std::optional<seastar::future<>> wait() = 0;
 
-  /// Releases pipeline stage, can only be called after wait
+  /// Releases pipeline resources, after or without waiting
   virtual void exit() = 0;
 
-  /// Releases pipeline resources without waiting on barrier
-  virtual void cancel() = 0;
-
-  /// Must ensure that resources are released, likely by calling cancel()
+  /// Must ensure that resources are released, likely by calling exit()
   virtual ~PipelineExitBarrierI() {}
 };
 
@@ -606,12 +603,8 @@ class OrderedExclusivePhaseT : public PipelineStageIT<T> {
       }
     }
 
-    void cancel() final {
-      exit();
-    }
-
     ~ExitBarrier() final {
-      cancel();
+      exit();
     }
   };
 
@@ -717,12 +710,8 @@ private:
       }
     }
 
-    void cancel() final {
-      exit();
-    }
-
     ~ExitBarrier() final {
-      cancel();
+      exit();
     }
   };
 
@@ -756,8 +745,6 @@ class UnorderedStageT : public PipelineStageIT<T> {
 
     void exit() final {}
 
-    void cancel() final {}
-
     ~ExitBarrier() final {}
   };