crimson/os/seastore: wire up get_fsid

Signed-off-by: Samuel Just <sjust@redhat.com>

diff --git a/src/crimson/os/seastore/seastore.cc b/src/crimson/os/seastore/seastore.cc
index 1c362dac29236685f0894c25c5204e053c0d3aa6..0e5c5c1603e17175ceb585fd8b4c3ac59a9be317 100644 (file)
--- a/src/crimson/os/seastore/seastore.cc
+++ b/src/crimson/os/seastore/seastore.cc
@@ -1022,7 +1022,7 @@ seastar::future<std::tuple<int, std::string>> SeaStore::read_meta(const std::str
 
 uuid_d SeaStore::get_fsid() const
 {
-  return osd_fsid;
+  return segment_manager->get_meta().seastore_id;
 }
 
 }

diff --git a/src/crimson/os/seastore/seastore.h b/src/crimson/os/seastore/seastore.h
index 1353bab33ce9495b118d6429d6114dfcbe4d3ee1..1eb568ebd0e2bdccc82157890445744abab4f6a2 100644 (file)
--- a/src/crimson/os/seastore/seastore.h
+++ b/src/crimson/os/seastore/seastore.h
@@ -30,8 +30,6 @@ using OnodeRef = boost::intrusive_ptr<Onode>;
 class TransactionManager;
 
 class SeaStore final : public FuturizedStore {
-  uuid_d osd_fsid;
-
 public:
 
   SeaStore(