From 6319d9837bc8982efab050952f4e91500c81d4cb Mon Sep 17 00:00:00 2001
From: "Jeff Washington (jwash)" <wash678@gmail.com>
Date: Fri, 8 Oct 2021 09:40:36 -0500
Subject: [PATCH] clean filler accts, too

---
 ledger/src/bank_forks_utils.rs | 1 +
 runtime/src/accounts_db.rs     | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/ledger/src/bank_forks_utils.rs b/ledger/src/bank_forks_utils.rs
index 6cca1a499c0c13..7c4b388df6fd33 100644
--- a/ledger/src/bank_forks_utils.rs
+++ b/ledger/src/bank_forks_utils.rs
@@ -95,6 +95,7 @@ pub fn load(
 
     if process_options
         .accounts_db_config
+        .as_ref()
         .and_then(|config| config.filler_account_count)
         .unwrap_or_default()
         > 0
diff --git a/runtime/src/accounts_db.rs b/runtime/src/accounts_db.rs
index a1cfdd85125fe9..66de240cdcb00c 100644
--- a/runtime/src/accounts_db.rs
+++ b/runtime/src/accounts_db.rs
@@ -1992,10 +1992,6 @@ impl AccountsDb {
                         let mut purges_zero_lamports = HashMap::new();
                         let mut purges_old_accounts = Vec::new();
                         for pubkey in pubkeys {
-                            if self.is_filler_account(pubkey) {
-                                continue;
-                            }
-
                             match self.accounts_index.get(pubkey, None, max_clean_root) {
                                 AccountIndexGetResult::Found(locked_entry, index) => {
                                     let slot_list = locked_entry.slot_list();
@@ -6515,7 +6511,7 @@ impl AccountsDb {
     }
 
     fn filler_rent_partition_prefix_bytes() -> usize {
-        std::mem::size_of::<u32>()
+        std::mem::size_of::<u64>()
     }
 
     fn filler_prefix_bytes() -> usize {