JournalingObjectStore: remove force_commit, no longer needed

Signed-off-by: Samuel Just <sam.just@inktank.com>

diff --git a/src/os/JournalingObjectStore.cc b/src/os/JournalingObjectStore.cc
index ecbac7ce7c22454c447d20dc8b74c43b937e7a5b..d42a96008cfec6f156a3d432090cb61647ab430b 100644 (file)
--- a/src/os/JournalingObjectStore.cc
+++ b/src/os/JournalingObjectStore.cc
@@ -205,7 +205,7 @@ bool JournalingObjectStore::commit_start()
   dout(10) << "commit_start blocked, all open_ops have completed" << dendl;
   assert(open_ops == 0);
 
-  if (applied_seq == committed_seq && !force_commit) {
+  if (applied_seq == committed_seq) {
     dout(10) << "commit_start nothing to do" << dendl;
     blocked = false;
     if (!ops_apply_blocked.empty())
@@ -214,7 +214,6 @@ bool JournalingObjectStore::commit_start()
     goto out;
   }
 
-  force_commit = false;
 
   com_lock.Lock();
   // we can _only_ read applied_seq here because open_ops == 0 (we've

diff --git a/src/os/JournalingObjectStore.h b/src/os/JournalingObjectStore.h
index e8d701ee9e144d1d3849aba2d11ddc006973b533..54a34da1932c528a2175234a58c322e5ca543a2f 100644 (file)
--- a/src/os/JournalingObjectStore.h
+++ b/src/os/JournalingObjectStore.h
@@ -38,16 +38,13 @@ protected:
   list<uint64_t> ops_submitting;
   list<Cond*> ops_apply_blocked;
 
-  bool replaying, force_commit;
+  bool replaying;
 
 protected:
   void journal_start();
   void journal_stop();
   int journal_replay(uint64_t fs_op_seq);
 
-  virtual void trigger_commit(uint64_t op_seq) = 0;
-  void _trigger_commit(uint64_t op_seq);
-
   // --
   uint64_t op_submit_start();
   void op_submit_finish(uint64_t op_seq);
@@ -82,7 +79,7 @@ public:
                            journal(NULL), finisher(g_ceph_context),
                            journal_lock("JournalingObjectStore::journal_lock"),
                            com_lock("JournalingObjectStore::com_lock"),
-                           replaying(false), force_commit(false) { }
+                           replaying(false) {}
   
 };