osdc/ObjectCacher.h: move classes to cc file

Move C_WriteCommit and C_WaitForWrite to cc file.

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>

diff --git a/src/osdc/ObjectCacher.cc b/src/osdc/ObjectCacher.cc
index 7e76b3cdd6d06118f774beb3d1a1fe216d591349..93b2412de53a1731ec7be474bca0eecc14b636bf 100644 (file)
--- a/src/osdc/ObjectCacher.cc
+++ b/src/osdc/ObjectCacher.cc
@@ -921,6 +921,27 @@ void ObjectCacher::bh_write_adjacencies(BufferHead *bh, ceph::real_time cutoff,
   bh_write_scattered(blist);
 }
 
+class ObjectCacher::C_WriteCommit : public Context {
+  ObjectCacher *oc;
+  int64_t poolid;
+  sobject_t oid;
+  vector<pair<loff_t, uint64_t> > ranges;
+public:
+  ceph_tid_t tid;
+  C_WriteCommit(ObjectCacher *c, int64_t _poolid, sobject_t o, loff_t s,
+               uint64_t l) :
+    oc(c), poolid(_poolid), oid(o), tid(0) {
+      ranges.push_back(make_pair(s, l));
+    }
+  C_WriteCommit(ObjectCacher *c, int64_t _poolid, sobject_t o,
+               vector<pair<loff_t, uint64_t> >& _ranges) :
+    oc(c), poolid(_poolid), oid(o), tid(0) {
+      ranges.swap(_ranges);
+    }
+  void finish(int r) {
+    oc->bh_write_commit(poolid, oid, ranges, tid, r);
+  }
+};
 void ObjectCacher::bh_write_scattered(list<BufferHead*>& blist)
 {
   assert(lock.is_locked());
@@ -1631,6 +1652,17 @@ int ObjectCacher::writex(OSDWrite *wr, ObjectSet *oset, Context *onfreespace)
   return r;
 }
 
+class ObjectCacher::C_WaitForWrite : public Context {
+public:
+  C_WaitForWrite(ObjectCacher *oc, uint64_t len, Context *onfinish) :
+    m_oc(oc), m_len(len), m_onfinish(onfinish) {}
+  void finish(int r);
+private:
+  ObjectCacher *m_oc;
+  uint64_t m_len;
+  Context *m_onfinish;
+};
+
 void ObjectCacher::C_WaitForWrite::finish(int r)
 {
   Mutex::Locker l(m_oc->lock);

diff --git a/src/osdc/ObjectCacher.h b/src/osdc/ObjectCacher.h
index b34a5de0139a34a3d71c9a05defdf71b834f0c73..4d2362cf4c3ff92419512fa2ec5d960a9c2e17a3 100644 (file)
--- a/src/osdc/ObjectCacher.h
+++ b/src/osdc/ObjectCacher.h
@@ -592,38 +592,8 @@ class ObjectCacher {
     }
   };
 
-  class C_WriteCommit : public Context {
-    ObjectCacher *oc;
-    int64_t poolid;
-    sobject_t oid;
-    vector<pair<loff_t, uint64_t> > ranges;
-  public:
-    ceph_tid_t tid;
-    C_WriteCommit(ObjectCacher *c, int64_t _poolid, sobject_t o, loff_t s,
-                 uint64_t l) :
-      oc(c), poolid(_poolid), oid(o), tid(0) {
-       ranges.push_back(make_pair(s, l));
-      }
-    C_WriteCommit(ObjectCacher *c, int64_t _poolid, sobject_t o,
-                 vector<pair<loff_t, uint64_t> >& _ranges) :
-      oc(c), poolid(_poolid), oid(o), tid(0) {
-       ranges.swap(_ranges);
-      }
-    void finish(int r) {
-      oc->bh_write_commit(poolid, oid, ranges, tid, r);
-    }
- };
-
-  class C_WaitForWrite : public Context {
-  public:
-    C_WaitForWrite(ObjectCacher *oc, uint64_t len, Context *onfinish) :
-      m_oc(oc), m_len(len), m_onfinish(onfinish) {}
-    void finish(int r);
-  private:
-    ObjectCacher *m_oc;
-    uint64_t m_len;
-    Context *m_onfinish;
-  };
+  class C_WriteCommit;
+  class C_WaitForWrite;
 
   void perf_start();
   void perf_stop();