66 lines
2.1 KiB
Diff
66 lines
2.1 KiB
Diff
From ed144047ef65601342eb7a821a8648b19d6b44a9 Mon Sep 17 00:00:00 2001
|
|
From: Kent Overstreet <kent.overstreet@linux.dev>
|
|
Date: Sat, 16 Nov 2024 23:54:19 -0500
|
|
Subject: [PATCH 097/233] bcachefs: kill bch2_journal_entries_free()
|
|
Content-Type: text/plain; charset="utf-8"
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
|
|
Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
|
|
---
|
|
fs/bcachefs/btree_journal_iter.c | 17 ++++++-----------
|
|
fs/bcachefs/btree_journal_iter.h | 2 --
|
|
2 files changed, 6 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/fs/bcachefs/btree_journal_iter.c b/fs/bcachefs/btree_journal_iter.c
|
|
index c44889ef9817..39898baa8854 100644
|
|
--- a/fs/bcachefs/btree_journal_iter.c
|
|
+++ b/fs/bcachefs/btree_journal_iter.c
|
|
@@ -527,16 +527,6 @@ void bch2_btree_and_journal_iter_init_node_iter(struct btree_trans *trans,
|
|
|
|
/* sort and dedup all keys in the journal: */
|
|
|
|
-void bch2_journal_entries_free(struct bch_fs *c)
|
|
-{
|
|
- struct journal_replay **i;
|
|
- struct genradix_iter iter;
|
|
-
|
|
- genradix_for_each(&c->journal_entries, iter, i)
|
|
- kvfree(*i);
|
|
- genradix_free(&c->journal_entries);
|
|
-}
|
|
-
|
|
/*
|
|
* When keys compare equal, oldest compares first:
|
|
*/
|
|
@@ -569,7 +559,12 @@ void bch2_journal_keys_put(struct bch_fs *c)
|
|
keys->data = NULL;
|
|
keys->nr = keys->gap = keys->size = 0;
|
|
|
|
- bch2_journal_entries_free(c);
|
|
+ struct journal_replay **i;
|
|
+ struct genradix_iter iter;
|
|
+
|
|
+ genradix_for_each(&c->journal_entries, iter, i)
|
|
+ kvfree(*i);
|
|
+ genradix_free(&c->journal_entries);
|
|
}
|
|
|
|
static void __journal_keys_sort(struct journal_keys *keys)
|
|
diff --git a/fs/bcachefs/btree_journal_iter.h b/fs/bcachefs/btree_journal_iter.h
|
|
index fa8c4f82c9c7..5ddbb7571770 100644
|
|
--- a/fs/bcachefs/btree_journal_iter.h
|
|
+++ b/fs/bcachefs/btree_journal_iter.h
|
|
@@ -81,8 +81,6 @@ static inline void bch2_journal_keys_put_initial(struct bch_fs *c)
|
|
c->journal_keys.initial_ref_held = false;
|
|
}
|
|
|
|
-void bch2_journal_entries_free(struct bch_fs *);
|
|
-
|
|
int bch2_journal_keys_sort(struct bch_fs *);
|
|
|
|
void bch2_shoot_down_journal_keys(struct bch_fs *, enum btree_id,
|
|
--
|
|
2.45.2
|
|
|