From 75e547ac179dcdfc24fa2c70eb858002f3933428 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Fri, 30 Apr 2021 14:11:43 -0700 Subject: [PATCH] crimson/os/seastore: wire up get_fsid Signed-off-by: Samuel Just --- src/crimson/os/seastore/seastore.cc | 2 +- src/crimson/os/seastore/seastore.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/crimson/os/seastore/seastore.cc b/src/crimson/os/seastore/seastore.cc index 1c362dac29236..0e5c5c1603e17 100644 --- a/src/crimson/os/seastore/seastore.cc +++ b/src/crimson/os/seastore/seastore.cc @@ -1022,7 +1022,7 @@ seastar::future> 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 1353bab33ce94..1eb568ebd0e2b 100644 --- a/src/crimson/os/seastore/seastore.h +++ b/src/crimson/os/seastore/seastore.h @@ -30,8 +30,6 @@ using OnodeRef = boost::intrusive_ptr; class TransactionManager; class SeaStore final : public FuturizedStore { - uuid_d osd_fsid; - public: SeaStore( -- 2.39.5