From f7727dd598820f53e43cd010870080664181cc60 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Wed, 17 Oct 2012 13:06:51 -0700 Subject: [PATCH] FileStore: next_finish is not used Signed-off-by: Samuel Just --- src/os/FileStore.cc | 5 +---- src/os/FileStore.h | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc index 94dbee9ed32c3..cd579ce92fb6a 100644 --- a/src/os/FileStore.cc +++ b/src/os/FileStore.cc @@ -729,7 +729,7 @@ FileStore::FileStore(const std::string &base, const std::string &jdev, const cha timer(g_ceph_context, sync_entry_timeo_lock), stop(false), sync_thread(this), default_osr("default"), - op_queue_len(0), op_queue_bytes(0), op_finisher(g_ceph_context), next_finish(0), + op_queue_len(0), op_queue_bytes(0), op_finisher(g_ceph_context), op_tp(g_ceph_context, "FileStore::op_tp", g_conf->filestore_op_threads, "filestore_op_threads"), op_wq(this, g_conf->filestore_op_thread_timeout, g_conf->filestore_op_thread_suicide_timeout, &op_tp), @@ -2220,9 +2220,6 @@ FileStore::Op *FileStore::build_op(list& tls, void FileStore::queue_op(OpSequencer *osr, Op *o) { assert(journal_lock.is_locked()); - // initialize next_finish on first op - if (next_finish == 0) - next_finish = op_seq; // mark apply start _now_, because we need to drain the entire apply // queue during commit in order to put the store in a consistent diff --git a/src/os/FileStore.h b/src/os/FileStore.h index 4c9e8f151da6a..b69415dbb1ada 100644 --- a/src/os/FileStore.h +++ b/src/os/FileStore.h @@ -205,7 +205,6 @@ private: uint64_t op_queue_len, op_queue_bytes; Cond op_throttle_cond; Finisher op_finisher; - uint64_t next_finish; ThreadPool op_tp; struct OpWQ : public ThreadPool::WorkQueue { -- 2.39.5