From: Sage Weil <sage@redhat.com>
Date: Mon, 14 Sep 2015 18:39:35 +0000 (-0400)
Subject: os/FileStore: assert Sequencer is passed in; kill default_osr
X-Git-Tag: v9.1.0~135^2~2^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=10b00f09d6f9c5434c917a122e81c19cee620cad;p=ceph.git

os/FileStore: assert Sequencer is passed in; kill default_osr

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 5f175444619..44cd9fd9e1c 100644
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -526,7 +526,6 @@ FileStore::FileStore(const std::string &base, const std::string &jdev, osflagbit
   stop(false), sync_thread(this),
   fdcache(g_ceph_context),
   wbthrottle(g_ceph_context),
-  default_osr("default"),
   throttle_ops(g_ceph_context, "filestore_ops",g_conf->filestore_queue_max_ops),
   throttle_bytes(g_ceph_context, "filestore_bytes",g_conf->filestore_queue_max_bytes),
   op_finisher(g_ceph_context),
@@ -1933,8 +1932,7 @@ int FileStore::queue_transactions(Sequencer *posr, list<Transaction*> &tls,
 
   // set up the sequencer
   OpSequencer *osr;
-  if (!posr)
-    posr = &default_osr;
+  assert(posr);
   if (posr->p) {
     osr = static_cast<OpSequencer *>(posr->p.get());
     dout(5) << "queue_transactions existing " << *osr << "/" << osr->parent << dendl; //<< " w/ q " << osr->q << dendl;
diff --git a/src/os/FileStore.h b/src/os/FileStore.h
index b9480b044cd..3e598271669 100644
--- a/src/os/FileStore.h
+++ b/src/os/FileStore.h
@@ -329,7 +329,6 @@ private:
   FDCache fdcache;
   WBThrottle wbthrottle;
 
-  Sequencer default_osr;
   deque<OpSequencer*> op_queue;
   Throttle throttle_ops, throttle_bytes;
   Finisher op_finisher;