diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2024-02-23 22:43:24 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-03-13 21:22:25 -0400 |
| commit | 69426613cdf0784e29e1a429c1a2f372a6267c43 (patch) | |
| tree | 08d9402cd8f82ccb17731096d4bcd5640bd6fe0b | |
| parent | 95ffc7fb8c7831ee79ed8d2c0e53c7b4869c6338 (diff) | |
| download | vfs-69426613cdf0784e29e1a429c1a2f372a6267c43.tar.gz | |
bcachefs: improve move_gap()
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
| -rw-r--r-- | fs/bcachefs/btree_journal_iter.c | 6 | ||||
| -rw-r--r-- | fs/bcachefs/recovery.c | 3 | ||||
| -rw-r--r-- | fs/bcachefs/util.h | 8 |
3 files changed, 9 insertions, 8 deletions
diff --git a/fs/bcachefs/btree_journal_iter.c b/fs/bcachefs/btree_journal_iter.c index 9291a897abab0..207dd32e2ecc9 100644 --- a/fs/bcachefs/btree_journal_iter.c +++ b/fs/bcachefs/btree_journal_iter.c @@ -218,8 +218,7 @@ int bch2_journal_key_insert_take(struct bch_fs *c, enum btree_id id, journal_iters_move_gap(c, keys->gap, idx); - move_gap(keys->data, keys->nr, keys->size, keys->gap, idx); - keys->gap = idx; + move_gap(keys, idx); keys->nr++; keys->data[keys->gap++] = n; @@ -473,8 +472,7 @@ void bch2_journal_keys_put(struct bch_fs *c) if (!atomic_dec_and_test(&keys->ref)) return; - move_gap(keys->data, keys->nr, keys->size, keys->gap, keys->nr); - keys->gap = keys->nr; + move_gap(keys, keys->nr); darray_for_each(*keys, i) if (i->allocated) diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c index d773af23a189b..f11e882de02bf 100644 --- a/fs/bcachefs/recovery.c +++ b/fs/bcachefs/recovery.c @@ -531,8 +531,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->data, keys->nr, keys->size, keys->gap, keys->nr); - keys->gap = keys->nr; + move_gap(keys, keys->nr); set_bit(BCH_FS_may_go_rw, &c->flags); diff --git a/fs/bcachefs/util.h b/fs/bcachefs/util.h index 7fed75c44cd59..b3d3a7349814c 100644 --- a/fs/bcachefs/util.h +++ b/fs/bcachefs/util.h @@ -756,8 +756,12 @@ static inline void __move_gap(void *array, size_t element_size, } /* Move the gap in a gap buffer: */ -#define move_gap(_array, _nr, _size, _old_gap, _new_gap) \ - __move_gap(_array, sizeof(_array[0]), _nr, _size, _old_gap, _new_gap) +#define move_gap(_d, _new_gap) \ +do { \ + __move_gap((_d)->data, sizeof((_d)->data[0]), \ + (_d)->nr, (_d)->size, (_d)->gap, _new_gap); \ + (_d)->gap = _new_gap; \ +} while (0) #define bubble_sort(_base, _nr, _cmp) \ do { \ |