diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2024-02-24 08:19:09 +0300 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-03-14 04:22:25 +0300 |
| commit | 95ffc7fb8c7831ee79ed8d2c0e53c7b4869c6338 (patch) | |
| tree | 648e97f59f45dfa88392ed61a4537063f52f1e4a /fs/bcachefs/recovery.c | |
| parent | 894d062254e29dd3e99a55029de5d976b1681eb3 (diff) | |
| download | linux-95ffc7fb8c7831ee79ed8d2c0e53c7b4869c6338.tar.xz | |
bcachefs: journal_keys now uses darray helpers
nice bit of code cleanup
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/recovery.c')
| -rw-r--r-- | fs/bcachefs/recovery.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c index 0aac62a7fe19..d773af23a189 100644 --- a/fs/bcachefs/recovery.c +++ b/fs/bcachefs/recovery.c @@ -70,9 +70,7 @@ static void drop_alloc_keys(struct journal_keys *keys) */ static void zero_out_btree_mem_ptr(struct journal_keys *keys) { - struct journal_key *i; - - for (i = keys->data; i < keys->data + keys->nr; i++) + darray_for_each(*keys, i) if (i->k->k.type == KEY_TYPE_btree_ptr_v2) bkey_i_to_btree_ptr_v2(i->k)->v.mem_ptr = 0; } @@ -177,11 +175,9 @@ static int bch2_journal_replay(struct bch_fs *c) * efficient - better locality of btree access - but some might fail if * that would cause a journal deadlock. */ - for (size_t i = 0; i < keys->nr; i++) { + darray_for_each(*keys, k) { cond_resched(); - struct journal_key *k = keys->data + i; - /* Skip fastpath if we're low on space in the journal */ ret = c->journal.watermark ? -1 : commit_do(trans, NULL, NULL, |