From 4fbd6b1950a15f603e0c5f27c60e48f4923342ea Mon Sep 17 00:00:00 2001 From: Michal Jarzabek Date: Tue, 16 Aug 2016 20:15:07 +0100 Subject: [PATCH] osdc/Journaler: move C_DelayFlush class to .cc Signed-off-by: Michal Jarzabek --- src/osdc/Journaler.cc | 9 +++++++++ src/osdc/Journaler.h | 12 +----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/osdc/Journaler.cc b/src/osdc/Journaler.cc index 2d6f85e5d7e3e..bdb764a0a1996 100644 --- a/src/osdc/Journaler.cc +++ b/src/osdc/Journaler.cc @@ -29,6 +29,15 @@ using std::chrono::seconds; +class Journaler::C_DelayFlush : public Context { + Journaler *journaler; + public: + C_DelayFlush(Journaler *j) : journaler(j) {} + void finish(int r) { + journaler->_do_delayed_flush(); + } +}; + void Journaler::set_readonly() { lock_guard l(lock); diff --git a/src/osdc/Journaler.h b/src/osdc/Journaler.h index b1983bbc1e5c3..6c7e7cf9db4e7 100644 --- a/src/osdc/Journaler.h +++ b/src/osdc/Journaler.h @@ -228,17 +228,7 @@ class Journaler { SafeTimer *timer; class C_DelayFlush; - friend class C_DelayFlush; - - class C_DelayFlush : public Context { - Journaler *journaler; - public: - C_DelayFlush(Journaler *j) : journaler(j) {} - void finish(int r) { - journaler->_do_delayed_flush(); - } - } *delay_flush_event; - + C_DelayFlush *delay_flush_event; /* * Do a flush as a result of a C_DelayFlush context. */