From: Kefu Chai Date: Wed, 4 Nov 2020 13:07:11 +0000 (+0800) Subject: osd/PGLog: drop template parameter of FuturizedStoreLogReader X-Git-Tag: v16.1.0~688^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e9fd452b3ee95f2eb9008a9ff2f5402d3140beff;p=ceph.git osd/PGLog: drop template parameter of FuturizedStoreLogReader there is no need for the generic type at this moment. Signed-off-by: Kefu Chai --- diff --git a/src/osd/PGLog.h b/src/osd/PGLog.h index cea890a4c691..617aa670eba7 100644 --- a/src/osd/PGLog.h +++ b/src/osd/PGLog.h @@ -1664,14 +1664,13 @@ public: missing, pgmeta_oid, this); } - template struct FuturizedStoreLogReader { crimson::os::FuturizedStore &store; crimson::os::CollectionRef ch; const pg_info_t &info; IndexedLog &log; std::set* log_keys_debug = NULL; - missing_type &missing; + pg_missing_tracker_t &missing; ghobject_t pgmeta_oid; const DoutPrefixProvider *dpp; @@ -1764,21 +1763,20 @@ public: } }; - template static seastar::future<> read_log_and_missing_crimson( crimson::os::FuturizedStore &store, crimson::os::CollectionRef ch, const pg_info_t &info, IndexedLog &log, std::set* log_keys_debug, - missing_type &missing, + pg_missing_tracker_t &missing, ghobject_t pgmeta_oid, const DoutPrefixProvider *dpp = nullptr ) { ldpp_dout(dpp, 20) << "read_log_and_missing coll " << ch->get_cid() << " " << pgmeta_oid << dendl; - return (new FuturizedStoreLogReader{ + return (new FuturizedStoreLogReader{ store, ch, info, log, log_keys_debug, missing, pgmeta_oid, dpp})->start(); }