]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osdc/Objecter: move LingerOp's ctor to .cc
authorKefu Chai <kchai@redhat.com>
Fri, 23 Jul 2021 16:09:58 +0000 (00:09 +0800)
committerKefu Chai <kchai@redhat.com>
Sat, 24 Jul 2021 05:47:58 +0000 (13:47 +0800)
so the linkage of fmt::fmt does not spill out to other compilation
units.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 0e0d320525437ce6868ac6dd532ccd4c7e4a6fff)

src/osdc/Objecter.cc
src/osdc/Objecter.h

index d935b73adb948a32d77d914f1c5b044416e441e9..da25c584f797421c69f4922746d3cf296719cf08 100644 (file)
@@ -4722,6 +4722,13 @@ void Objecter::handle_command_reply(MCommandReply *m)
   m->put();
 }
 
+Objecter::LingerOp::LingerOp(Objecter *o, uint64_t linger_id)
+  : objecter(o),
+    linger_id(linger_id),
+    watch_lock(ceph::make_shared_mutex(
+                fmt::format("LingerOp::watch_lock #{}", linger_id)))
+{}
+
 void Objecter::submit_command(CommandOp *c, ceph_tid_t *ptid)
 {
   shunique_lock sul(rwlock, ceph::acquire_unique);
index 5af605913c06d1cbffa8e43791aa35a89534fdd4..163a3359de799f6b909c7e4ef1465cbc40ca062c 100644 (file)
@@ -2304,11 +2304,7 @@ public:
       watch_pending_async.pop_front();
     }
 
-    explicit LingerOp(Objecter *o, uint64_t linger_id)
-      : objecter(o), linger_id(linger_id),
-       watch_lock(ceph::make_shared_mutex(
-                    fmt::format("LingerOp::watch_lock #{}", linger_id))) {}
-
+    LingerOp(Objecter *o, uint64_t linger_id);
     const LingerOp& operator=(const LingerOp& r) = delete;
     LingerOp(const LingerOp& o) = delete;