From: Sage Weil <sage@redhat.com>
Date: Mon, 14 Sep 2015 19:20:45 +0000 (-0400)
Subject: os/newstore: kill default_osr
X-Git-Tag: v9.1.0~135^2~2^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=16c672c7772888e7738729fb19ddcbca9c2e4bf9;p=ceph.git

os/newstore: kill default_osr

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

diff --git a/src/os/newstore/NewStore.cc b/src/os/newstore/NewStore.cc
index 953dcd22d586..0bd70200acc3 100644
--- a/src/os/newstore/NewStore.cc
+++ b/src/os/newstore/NewStore.cc
@@ -608,7 +608,6 @@ NewStore::NewStore(CephContext *cct, const string& path)
     kv_lock("NewStore::kv_lock"),
     kv_stop(false),
     logger(NULL),
-    default_osr("default"),
     reap_lock("NewStore::reap_lock")
 {
   _init_logger();
@@ -2759,8 +2758,7 @@ int NewStore::queue_transactions(
 
   // 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) << __func__ << " existing " << *osr << "/" << osr->parent << dendl; //<< " w/ q " << osr->q << dendl;
diff --git a/src/os/newstore/NewStore.h b/src/os/newstore/NewStore.h
index a399bc046237..97c5d6a8a979 100644
--- a/src/os/newstore/NewStore.h
+++ b/src/os/newstore/NewStore.h
@@ -504,8 +504,6 @@ private:
 
   Logger *logger;
 
-  Sequencer default_osr;
-
   Mutex reap_lock;
   Cond reap_cond;
   list<CollectionRef> removed_collections;