diff options
author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-02-03 13:10:55 -0500 |
---|---|---|
committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:08:52 -0400 |
commit | 4b8f89afd44592d50f7309750e7835fc777dfb08 (patch) | |
tree | 0b93ad735f3b5438b42b9fc2eb8b8a82fee49920 /fs/bcachefs/journal.c | |
parent | 91f6ad6f947c96545eb7790569b279fdeac06153 (diff) |
bcachefs: Fixes/improvements for journal entry reservations
This fixes some arithmetic bugs in "bcachefs: Journal updates to dev
usage" - additionally, it cleans things up by switching everything that
goes in every journal entry to the journal_entry_res mechanism.
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/journal.c')
-rw-r--r-- | fs/bcachefs/journal.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/bcachefs/journal.c b/fs/bcachefs/journal.c index 379b9ad2c0f9..7c805dd74180 100644 --- a/fs/bcachefs/journal.c +++ b/fs/bcachefs/journal.c @@ -1119,13 +1119,6 @@ int bch2_fs_journal_init(struct journal *j) j->write_delay_ms = 1000; j->reclaim_delay_ms = 100; - /* Btree roots: */ - j->entry_u64s_reserved += - BTREE_ID_NR * (JSET_KEYS_U64s + BKEY_BTREE_PTR_U64s_MAX); - - j->entry_u64s_reserved += - 2 * (sizeof(struct jset_entry_clock) / sizeof(u64)); - atomic64_set(&j->reservations.counter, ((union journal_res_state) { .cur_entry_offset = JOURNAL_ENTRY_CLOSED_VAL }).v); |