From: Josh Durgin <jdurgin@redhat.com>
Date: Wed, 7 Feb 2018 22:04:08 +0000 (-0800)
Subject: Merge pull request #20173 from liewegas/wip-os-ch
X-Git-Tag: v13.0.2~325
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eae6e64034233485c9e76a8054e6b3811ef4d47b;p=ceph.git

Merge pull request #20173 from liewegas/wip-os-ch

os: unify Sequencer and CollectionHandle

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

eae6e64034233485c9e76a8054e6b3811ef4d47b
diff --cc src/test/objectstore/store_test.cc
index 9db8a582ce96d,b4b35081c1a56..66a11b74c0f91
--- a/src/test/objectstore/store_test.cc
+++ b/src/test/objectstore/store_test.cc
@@@ -5763,9 -5786,9 +5786,8 @@@ void doMany4KWritesTest(boost::scoped_p
                          unsigned max_ops,
                          unsigned max_object_size,
                          unsigned max_write_size,
 -                        unsigned write_alignment,
 -                        store_statfs_t* res_stat)
 +                        unsigned write_alignment)
  {
-   ObjectStore::Sequencer osr("test");
    MixedGenerator gen(555);
    gen_type rng(time(NULL));
    coll_t cid(spg_t(pg_t(0,555), shard_id_t::NO_SHARD));