From: Xuehan Xu <xxhdx1985126@gmail.com>
Date: Wed, 2 Dec 2020 08:48:15 +0000 (+0800)
Subject: crimson/osd: drop redundant locking operations in ObjectContext::wait_recovery_read()
X-Git-Tag: v16.1.0~408^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fa27b6eb85297950a4ac51799479b5181f42b709;p=ceph.git

crimson/osd: drop redundant locking operations in ObjectContext::wait_recovery_read()

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
---

diff --git a/src/crimson/osd/object_context.h b/src/crimson/osd/object_context.h
index 7e14ac3e16f0..16bae92a7950 100644
--- a/src/crimson/osd/object_context.h
+++ b/src/crimson/osd/object_context.h
@@ -163,10 +163,8 @@ public:
       return false;
     }
   }
-  seastar::future<> wait_recovery_read() {
-    return lock.lock_for_read().then([this] {
-      recovery_read_marker = true;
-    });
+  void wait_recovery_read() {
+    recovery_read_marker = true;
   }
   void drop_recovery_read() {
     assert(recovery_read_marker);
diff --git a/src/crimson/osd/replicated_recovery_backend.cc b/src/crimson/osd/replicated_recovery_backend.cc
index 42fc442ec435..274b06cfecfa 100644
--- a/src/crimson/osd/replicated_recovery_backend.cc
+++ b/src/crimson/osd/replicated_recovery_backend.cc
@@ -126,7 +126,8 @@ auto ReplicatedRecoveryBackend::load_obc_for_recovery(
   return pg.with_head_obc<RWState::RWREAD>(soid, [&recovery_waiter](auto obc) {
     logger().debug("load_obc_for_recovery: loaded obc: {}", obc->obs.oi.soid);
     recovery_waiter.obc = obc;
-    return recovery_waiter.obc->wait_recovery_read();
+    recovery_waiter.obc->wait_recovery_read();
+    return seastar::now();
   });
 }