|
 |
b08661 |
From 00e90946e6ffc0bb5bf11f02d6fd8993974e8159 Mon Sep 17 00:00:00 2001
|
|
|
b08661 |
From: Kefu Chai <kchai@redhat.com>
|
|
|
b08661 |
Date: Sat, 24 Jul 2021 00:09:58 +0800
|
|
|
b08661 |
Subject: [PATCH 1/3] osdc/Objecter: move LingerOp's ctor to .cc
|
|
|
b08661 |
|
|
|
b08661 |
so the linkage of fmt::fmt does not spill out to other compilation
|
|
|
b08661 |
units.
|
|
|
b08661 |
|
|
|
b08661 |
Signed-off-by: Kefu Chai <kchai@redhat.com>
|
|
|
b08661 |
---
|
|
|
b08661 |
src/osdc/Objecter.cc | 7 +++++++
|
|
|
b08661 |
src/osdc/Objecter.h | 6 +-----
|
|
|
b08661 |
2 files changed, 8 insertions(+), 5 deletions(-)
|
|
|
b08661 |
|
|
|
b08661 |
diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
|
|
|
b08661 |
index d935b73adb9..da25c584f79 100644
|
|
|
b08661 |
--- a/src/osdc/Objecter.cc
|
|
|
b08661 |
+++ b/src/osdc/Objecter.cc
|
|
|
b08661 |
@@ -4722,6 +4722,13 @@ void Objecter::handle_command_reply(MCommandReply *m)
|
|
|
b08661 |
m->put();
|
|
|
b08661 |
}
|
|
|
b08661 |
|
|
|
b08661 |
+Objecter::LingerOp::LingerOp(Objecter *o, uint64_t linger_id)
|
|
|
b08661 |
+ : objecter(o),
|
|
|
b08661 |
+ linger_id(linger_id),
|
|
|
b08661 |
+ watch_lock(ceph::make_shared_mutex(
|
|
|
b08661 |
+ fmt::format("LingerOp::watch_lock #{}", linger_id)))
|
|
|
b08661 |
+{}
|
|
|
b08661 |
+
|
|
|
b08661 |
void Objecter::submit_command(CommandOp *c, ceph_tid_t *ptid)
|
|
|
b08661 |
{
|
|
|
b08661 |
shunique_lock sul(rwlock, ceph::acquire_unique);
|
|
|
b08661 |
diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
|
|
|
b08661 |
index 5af605913c0..163a3359de7 100644
|
|
|
b08661 |
--- a/src/osdc/Objecter.h
|
|
|
b08661 |
+++ b/src/osdc/Objecter.h
|
|
|
b08661 |
@@ -2304,11 +2304,7 @@ public:
|
|
|
b08661 |
watch_pending_async.pop_front();
|
|
|
b08661 |
}
|
|
|
b08661 |
|
|
|
b08661 |
- explicit LingerOp(Objecter *o, uint64_t linger_id)
|
|
|
b08661 |
- : objecter(o), linger_id(linger_id),
|
|
|
b08661 |
- watch_lock(ceph::make_shared_mutex(
|
|
|
b08661 |
- fmt::format("LingerOp::watch_lock #{}", linger_id))) {}
|
|
|
b08661 |
-
|
|
|
b08661 |
+ LingerOp(Objecter *o, uint64_t linger_id);
|
|
|
b08661 |
const LingerOp& operator=(const LingerOp& r) = delete;
|
|
|
b08661 |
LingerOp(const LingerOp& o) = delete;
|
|
|
b08661 |
|
|
|
b08661 |
--
|
|
|
b08661 |
2.31.1
|
|
|
b08661 |
|