From 894d062254e29dd3e99a55029de5d976b1681eb3 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Sat, 24 Feb 2024 00:15:56 -0500 Subject: bcachefs: Rename journal_keys.d -> journal_keys.data This will let us use some darray helpers in the next patch. Signed-off-by: Kent Overstreet --- fs/bcachefs/recovery.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'fs/bcachefs/recovery.c') diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c index 83f95d22fa81..0aac62a7fe19 100644 --- a/fs/bcachefs/recovery.c +++ b/fs/bcachefs/recovery.c @@ -57,8 +57,8 @@ static void drop_alloc_keys(struct journal_keys *keys) size_t src, dst; for (src = 0, dst = 0; src < keys->nr; src++) - if (!btree_id_is_alloc(keys->d[src].btree_id)) - keys->d[dst++] = keys->d[src]; + if (!btree_id_is_alloc(keys->data[src].btree_id)) + keys->data[dst++] = keys->data[src]; keys->nr = dst; } @@ -72,7 +72,7 @@ static void zero_out_btree_mem_ptr(struct journal_keys *keys) { struct journal_key *i; - for (i = keys->d; i < keys->d + keys->nr; i++) + for (i = keys->data; i < keys->data + keys->nr; i++) if (i->k->k.type == KEY_TYPE_btree_ptr_v2) bkey_i_to_btree_ptr_v2(i->k)->v.mem_ptr = 0; } @@ -180,7 +180,7 @@ static int bch2_journal_replay(struct bch_fs *c) for (size_t i = 0; i < keys->nr; i++) { cond_resched(); - struct journal_key *k = keys->d + i; + struct journal_key *k = keys->data + i; /* Skip fastpath if we're low on space in the journal */ ret = c->journal.watermark ? -1 : @@ -535,7 +535,7 @@ static int bch2_set_may_go_rw(struct bch_fs *c) * setting journal_key->overwritten: it will be accessed by multiple * threads */ - move_gap(keys->d, keys->nr, keys->size, keys->gap, keys->nr); + move_gap(keys->data, keys->nr, keys->size, keys->gap, keys->nr); keys->gap = keys->nr; set_bit(BCH_FS_may_go_rw, &c->flags); -- cgit v1.2.3-70-g09d2