import quincy beta 17.1.0

[ceph.git] / ceph / src / crimson / osd / osd_meta.cc

diff --git a/ceph/src/crimson/osd/osd_meta.cc b/ceph/src/crimson/osd/osd_meta.cc
index 9b9215f5b61660839aa1f9ff99fe48aceafea665..eeea9b57280eb4ddb18070c1987bba9bee393164 100644 (file)
--- a/ceph/src/crimson/osd/osd_meta.cc
+++ b/ceph/src/crimson/osd/osd_meta.cc
@@ -10,6 +10,7 @@
 #include "crimson/os/futurized_store.h"
 #include "os/Transaction.h"
 
+using std::string;
 using read_errorator = crimson::os::FuturizedStore::read_errorator;
 
 void OSDMeta::create(ceph::os::Transaction& t)
@@ -25,9 +26,9 @@ void OSDMeta::store_map(ceph::os::Transaction& t,
 
 seastar::future<bufferlist> OSDMeta::load_map(epoch_t e)
 {
-  return store->read(coll,
-                     osdmap_oid(e), 0, 0,
-                     CEPH_OSD_OP_FLAG_FADVISE_WILLNEED).handle_error(
+  return store.read(coll,
+                    osdmap_oid(e), 0, 0,
+                    CEPH_OSD_OP_FLAG_FADVISE_WILLNEED).handle_error(
     read_errorator::all_same_way([e] {
       throw std::runtime_error(fmt::format("read gave enoent on {}",
                                            osdmap_oid(e)));
@@ -44,7 +45,7 @@ void OSDMeta::store_superblock(ceph::os::Transaction& t,
 
 seastar::future<OSDSuperblock> OSDMeta::load_superblock()
 {
-  return store->read(coll, superblock_oid(), 0, 0).safe_then(
+  return store.read(coll, superblock_oid(), 0, 0).safe_then(
     [] (bufferlist&& bl) {
       auto p = bl.cbegin();
       OSDSuperblock superblock;
@@ -60,7 +61,7 @@ seastar::future<std::tuple<pg_pool_t,
                           std::string,
                           OSDMeta::ec_profile_t>>
 OSDMeta::load_final_pool_info(int64_t pool) {
-  return store->read(coll, final_pool_info_oid(pool),
+  return store.read(coll, final_pool_info_oid(pool),
                      0, 0).safe_then([] (bufferlist&& bl) {
     auto p = bl.cbegin();
     pg_pool_t pi;