Merge branch 'osdc_journaler_moveCDelayFlushClass' of git://github.co…

…m/stiopaa1/ceph into greg-fs-testing #10744 Reviewed-by: Greg Farnum <gfarnum@redhat.com>
ceph · Aug 29, 2016 · 1ffe49e · 1ffe49e
2 parents 89fd03f + 4fbd6b1
commit 1ffe49e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git 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
@@ -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.
    */