diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2022-08-10 12:34:18 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:09:37 -0400 |
| commit | fa3ae3ca4e13d86fe5f97c275748b3820c873091 (patch) | |
| tree | 1ad19fe6b78ff9b697b4fd64bdc1529f0bc7cd48 /fs | |
| parent | 315c9ba6da5b480618a80dcb91a74a86e49366bb (diff) | |
bcachefs: six_lock_counts() is now in six.c
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/bcachefs/btree_iter.c | 6 | ||||
| -rw-r--r-- | fs/bcachefs/trace.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c index 479e46a26f46..2c24faca623a 100644 --- a/fs/bcachefs/btree_iter.c +++ b/fs/bcachefs/btree_iter.c @@ -131,7 +131,7 @@ void bch2_btree_node_unlock_write(struct btree_trans *trans, bch2_btree_node_unlock_write_inlined(trans, path, b); } -static struct six_lock_count btree_node_lock_counts(struct btree_trans *trans, +struct six_lock_count bch2_btree_node_lock_counts(struct btree_trans *trans, struct btree_path *skip, struct btree *b, unsigned level) @@ -161,7 +161,7 @@ static inline void six_lock_readers_add(struct six_lock *lock, int nr) void __bch2_btree_node_lock_write(struct btree_trans *trans, struct btree *b) { - int readers = btree_node_lock_counts(trans, NULL, b, b->c.level).read; + int readers = bch2_btree_node_lock_counts(trans, NULL, b, b->c.level).read; /* * Must drop our read locks before calling six_lock_write() - @@ -244,7 +244,7 @@ bool bch2_btree_node_upgrade(struct btree_trans *trans, path->btree_id, &path->pos, btree_node_locked(path, level), - btree_node_lock_counts(trans, NULL, b, level), + bch2_btree_node_lock_counts(trans, NULL, b, level), six_lock_counts(&b->c.lock)); return false; success: diff --git a/fs/bcachefs/trace.c b/fs/bcachefs/trace.c index b770973faa14..eff1e3dfbcea 100644 --- a/fs/bcachefs/trace.c +++ b/fs/bcachefs/trace.c @@ -4,9 +4,9 @@ #include "buckets.h" #include "btree_types.h" #include "keylist.h" +#include "six.h" #include <linux/blktrace_api.h> -#include "keylist.h" #define CREATE_TRACE_POINTS #include "trace.h" |