From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Mon, 15 Mar 2021 19:22:03 +0000 (+0000)
Subject: crimson/osd: PG::with_locked_obc() doesn't depend on Op anymore.
X-Git-Tag: v17.1.0~2209^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=46bd5154105cb79711c455bd305ea3282040a52e;p=ceph.git

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 09e10a1a7b4d..8430288c81d5 100644
--- 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 7e09e2436be6..3425c951ef09 100644
--- 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 adb44b20ef09..f633f89636c7 100644
--- 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);