Merge pull request #11001 from stiopaa1/client_barrier_moveCBlockSync…

…Class client/barrier: move C_Block_Sync class to .cc Reviewed-by: John Spray <john.spray@redhat.com>
ceph · Sep 9, 2016 · 7635ed6 · 7635ed6
2 parents 9faf778 + 3d9e698
commit 7635ed6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/src/client/barrier.cc b/src/client/barrier.cc
@@ -29,6 +29,24 @@
   *_dout << "client." << cl->whoami << " "
 
 /* C_Block_Sync */
+class C_Block_Sync : public Context {
+private:
+  Client *cl;
+  uint64_t ino;
+  barrier_interval iv;
+  enum CBlockSync_State state;
+  Barrier *barrier;
+  int *rval; /* see Cond.h */
+
+public:
+  boost::intrusive::list_member_hook<> intervals_hook;
+  C_Block_Sync(Client *c, uint64_t i, barrier_interval iv, int *r);
+  void finish(int rval);
+
+  friend class Barrier;
+  friend class BarrierContext;
+};
+
 C_Block_Sync::C_Block_Sync(Client *c, uint64_t i, barrier_interval iv,
 			   int *r=0) :
   cl(c), ino(i), iv(iv), rval(r)

diff --git a/src/client/barrier.h b/src/client/barrier.h
@@ -42,26 +42,9 @@ enum CBlockSync_State
   CBlockSync_State_Completed,
 };
 
-class Barrier;
 class BarrierContext;
 
-class C_Block_Sync : public Context {
-private:
-  Client *cl;
-  uint64_t ino;
-  barrier_interval iv;
-  enum CBlockSync_State state;
-  Barrier *barrier;
-  int *rval; /* see Cond.h */
-
-public:
-  boost::intrusive::list_member_hook<> intervals_hook;
-  C_Block_Sync(Client *c, uint64_t i, barrier_interval iv, int *r);
-  void finish(int rval);
-
-  friend class Barrier;
-  friend class BarrierContext;
-};
+class C_Block_Sync;
 
 typedef boost::intrusive::list< C_Block_Sync,
 				boost::intrusive::member_hook<