From: Radosław Zarzyński <rzarzyns@redhat.com>
Date: Wed, 13 Apr 2022 10:01:18 +0000 (+0200)
Subject: crimson/osd: move SubOpBlocker from .cc to header
X-Git-Tag: v18.0.0~947^2~24
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a9ce8d81c8825e6555b1d497cf619d6978a8a82a;p=ceph.git

crimson/osd: move SubOpBlocker from .cc to header

Signed-off-by: Radosław Zarzyński <rzarzyns@redhat.com>
---

diff --git a/src/crimson/osd/osd_operations/compound_peering_request.cc b/src/crimson/osd/osd_operations/compound_peering_request.cc
index 42e827600b2f..29c9b437fb8b 100644
--- a/src/crimson/osd/osd_operations/compound_peering_request.cc
+++ b/src/crimson/osd/osd_operations/compound_peering_request.cc
@@ -100,24 +100,6 @@ std::vector<crimson::OperationRef> handle_pg_create(
   return ret;
 }
 
-struct SubOpBlocker : crimson::BlockerT<SubOpBlocker> {
-  static constexpr const char * type_name = "CompoundOpBlocker";
-
-  std::vector<crimson::OperationRef> subops;
-  SubOpBlocker(std::vector<crimson::OperationRef> &&subops)
-    : subops(subops) {}
-
-  virtual void dump_detail(Formatter *f) const {
-    f->open_array_section("dependent_operations");
-    {
-      for (auto &i : subops) {
-	i->dump_brief(f);
-      }
-    }
-    f->close_section();
-  }
-};
-
 } // namespace
 
 namespace crimson::osd {
diff --git a/src/crimson/osd/osd_operations/compound_peering_request.h b/src/crimson/osd/osd_operations/compound_peering_request.h
index 9f93b6d64cbd..411d4919312d 100644
--- a/src/crimson/osd/osd_operations/compound_peering_request.h
+++ b/src/crimson/osd/osd_operations/compound_peering_request.h
@@ -23,6 +23,24 @@ public:
   static constexpr OperationTypeCode type =
     OperationTypeCode::compound_peering_request;
 
+  struct SubOpBlocker : crimson::BlockerT<SubOpBlocker> {
+    static constexpr const char * type_name = "CompoundOpBlocker";
+
+    std::vector<crimson::OperationRef> subops;
+    SubOpBlocker(std::vector<crimson::OperationRef> &&subops)
+      : subops(subops) {}
+
+    virtual void dump_detail(Formatter *f) const {
+      f->open_array_section("dependent_operations");
+      {
+        for (auto &i : subops) {
+          i->dump_brief(f);
+        }
+      }
+      f->close_section();
+    }
+  };
+
 private:
   OSD &osd;
   crimson::net::ConnectionRef conn;