crimson/osd: PG::with_locked_obc() doesn't depend on Op anymore.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

diff --git a/src/crimson/osd/osd_operations/client_request.cc b/src/crimson/osd/osd_operations/client_request.cc
index 09e10a1a7b4d86720556e40141375693b936bebf..8430288c81d53d55c87f8374bf263b4c7b2ccde8 100644 (file)
--- a/src/crimson/osd/osd_operations/client_request.cc
+++ b/src/crimson/osd/osd_operations/client_request.cc
@@ -182,10 +182,10 @@ ClientRequest::process_op(Ref<PG> &pg)
           [this, pg]() mutable -> PG::load_obc_iertr::future<> {
           logger().debug("{}: got obc lock", *this);
           op_info.set_from_op(&*m, *pg->get_osdmap());
-          return pg->with_locked_obc(m, op_info, this, [this, pg](auto obc) mutable {
+          return pg->with_locked_obc(m, op_info, [this, pg](auto obc) mutable {
             return with_blocking_future_interruptible<IOInterruptCondition>(
-                handle.enter(pp(*pg).process)).then_interruptible(
-              [this, pg, obc]() mutable {
+              handle.enter(pp(*pg).process)
+            ).then_interruptible([this, pg, obc]() mutable {
               return do_process(pg, obc);
             });
           });

diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc
index 7e09e2436be69c1900a00fa233700d53698b6367..3425c951ef09815a3a320ca137a662d837875326 100644 (file)
--- a/src/crimson/osd/pg.cc
+++ b/src/crimson/osd/pg.cc
@@ -976,7 +976,7 @@ PG::reload_obc(crimson::osd::ObjectContext& obc) const
 
 PG::load_obc_iertr::future<>
 PG::with_locked_obc(Ref<MOSDOp> &m, const OpInfo &op_info,
-                   Operation *op, with_obc_func_t &&f)
+                   with_obc_func_t &&f)
 {
   if (__builtin_expect(stopping, false)) {
     throw crimson::common::system_shutdown_exception();

diff --git a/src/crimson/osd/pg.h b/src/crimson/osd/pg.h
index adb44b20ef0998d81d6940b9688b1601f0c68e5b..f633f89636c777336ef8e8205bc904108a47c0c5 100644 (file)
--- a/src/crimson/osd/pg.h
+++ b/src/crimson/osd/pg.h
@@ -520,7 +520,6 @@ public:
   load_obc_iertr::future<> with_locked_obc(
     Ref<MOSDOp> &m,
     const OpInfo &op_info,
-    Operation *op,
     with_obc_func_t&& f);
 
   interruptible_future<> handle_rep_op(Ref<MOSDRepOp> m);