diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2022-08-10 12:34:18 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-03-13 11:34:33 -0400 |
| commit | aa6abfd994fab5aec29726397e8ff0a653b02070 (patch) | |
| tree | 4e770876846f66ce3bb147e128d56a6f07963457 | |
| parent | d9099c731a9266320cd067ffb46914d0f093b74d (diff) | |
bcachefs: six_lock_counts() is now in six.c
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
| -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 8b942259bbde..a9b8d9708086 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 59e8dfa3d245..705496d0cc96 100644 --- a/fs/bcachefs/trace.c +++ b/fs/bcachefs/trace.c @@ -6,7 +6,7 @@ #include "keylist.h" #include <linux/blktrace_api.h> -#include "keylist.h" +#include <linux/six.h> #define CREATE_TRACE_POINTS #include <trace/events/bcachefs.h> |