From 117ac901ac18a4ab1b6b96bbdf95602f539e36f9 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Fri, 5 Oct 2012 16:26:35 -0700 Subject: [PATCH] JournalingObjectStore: remove force_commit, no longer needed Signed-off-by: Samuel Just --- src/os/JournalingObjectStore.cc | 3 +-- src/os/JournalingObjectStore.h | 7 ++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/os/JournalingObjectStore.cc b/src/os/JournalingObjectStore.cc index ecbac7ce7c224..d42a96008cfec 100644 --- 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 e8d701ee9e144..54a34da1932c5 100644 --- a/src/os/JournalingObjectStore.h +++ b/src/os/JournalingObjectStore.h @@ -38,16 +38,13 @@ protected: list ops_submitting; list 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) {} }; -- 2.39.5