From 54bc1bd5d4ba36f30ac624ca904eeacb7f941b9b Mon Sep 17 00:00:00 2001
From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Mon, 14 Dec 2020 18:10:10 +0100
Subject: [PATCH] crimson/osd: ObjectContext is not a Blocker anymore.

This is a follow-up to the c2dc437f78cd8be393c4d2eb8d79ce9c351ec4de
which removes unused OBC mebers after the with_lock() transition.

I'm not sure there is a reason to keep the `Blocker` bits as all
`ObjectContext::dump_detail()` does is just dumping `object_state_t`
while entering the OBC stage is already denoted by `PGPipeline::get_obc`.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---
 src/crimson/osd/object_context.cc |  7 -------
 src/crimson/osd/object_context.h  | 23 +----------------------
 2 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/src/crimson/osd/object_context.cc b/src/crimson/osd/object_context.cc
index 6f20b62a1c4..bbc71d3f9a4 100644
--- a/src/crimson/osd/object_context.cc
+++ b/src/crimson/osd/object_context.cc
@@ -8,13 +8,6 @@
 
 namespace crimson::osd {
 
-void ObjectContext::dump_detail(Formatter *f) const
-{
-  f->open_object_section("ObjectContext");
-  obs.oi.dump(f);
-  f->close_section();
-}
-
 ObjectContextRegistry::ObjectContextRegistry(crimson::common::ConfigProxy &conf)
 {
   obc_lru.set_target_size(conf.get_val<uint64_t>("crimson_osd_obc_lru_size"));
diff --git a/src/crimson/osd/object_context.h b/src/crimson/osd/object_context.h
index f108d2cb717..2527dd98262 100644
--- a/src/crimson/osd/object_context.h
+++ b/src/crimson/osd/object_context.h
@@ -35,8 +35,7 @@ struct obc_to_hoid {
   }
 };
 
-class ObjectContext : public Blocker,
-		      public ceph::common::intrusive_lru_base<
+class ObjectContext : public ceph::common::intrusive_lru_base<
   ceph::common::intrusive_lru_config<
     hobject_t, ObjectContext, obc_to_hoid<ObjectContext>>>
 {
@@ -98,19 +97,6 @@ private:
   tri_mutex lock;
   bool recovery_read_marker = false;
 
-  const char *get_type_name() const final {
-    return "ObjectContext";
-  }
-  void dump_detail(Formatter *f) const final;
-
-  template <typename LockF>
-  seastar::future<> get_lock(
-    Operation *op,
-    LockF &&lockf) {
-    return op->with_blocking_future(
-      make_blocking_future(std::forward<LockF>(lockf)));
-  }
-
   template <typename Lock, typename Func>
   auto _with_lock(Lock&& lock, Func&& func) {
     Ref obc = this;
@@ -160,13 +146,6 @@ public:
     return lock.is_acquired();
   }
 
-  template <typename F>
-  seastar::future<> get_write_greedy(Operation *op) {
-    return get_lock(op, [this] {
-      return lock.lock_for_write(true);
-    });
-  }
-
   bool get_recovery_read() {
     if (lock.try_lock_for_read()) {
       recovery_read_marker = true;