From fca5689052c00aac2b2fd54a11137bdb60ea1789 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Sun, 18 Sep 2022 16:16:57 +0300 Subject: [PATCH] dirty_memory_manager: drop memory_hard_limit::shutdown() It is empty. --- dirty_memory_manager.hh | 4 ---- replica/database.cc | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/dirty_memory_manager.hh b/dirty_memory_manager.hh index 2600d87d7a..fbd5b0f623 100644 --- a/dirty_memory_manager.hh +++ b/dirty_memory_manager.hh @@ -225,10 +225,6 @@ public: void add(region_group* child); void del(region_group* child); - future<> shutdown() { - return make_ready_future<>(); - } - template friend void do_update(RG* rg, RG*& top_relief, ssize_t delta); diff --git a/replica/database.cc b/replica/database.cc index c29828bfec..49fa2d4a9a 100644 --- a/replica/database.cc +++ b/replica/database.cc @@ -1729,9 +1729,7 @@ future<> dirty_memory_manager::shutdown() { _db_shutdown_requested = true; _should_flush.signal(); return std::move(_waiting_flush).then([this] { - return _virtual_region_group.shutdown().then([this] { - return _real_region_group.shutdown(); - }); + return _virtual_region_group.shutdown(); }); }