From: Samuel Just <sjust@redhat.com>
Date: Fri, 30 Apr 2021 21:11:43 +0000 (-0700)
Subject: crimson/os/seastore: wire up get_fsid
X-Git-Tag: v17.1.0~2043^2~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=75e547ac179dcdfc24fa2c70eb858002f3933428;p=ceph.git

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 1c362dac2923..0e5c5c1603e1 100644
--- 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 1353bab33ce9..1eb568ebd0e2 100644
--- 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(