Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
fa3ae3ca
Commit
fa3ae3ca
authored
2 years ago
by
Kent Overstreet
Committed by
Kent Overstreet
1 year ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bcachefs: six_lock_counts() is now in six.c
Signed-off-by:
Kent Overstreet
<
kent.overstreet@linux.dev
>
parent
315c9ba6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
fs/bcachefs/btree_iter.c
fs/bcachefs/btree_iter.c
+3
-3
fs/bcachefs/trace.c
fs/bcachefs/trace.c
+1
-1
No files found.
fs/bcachefs/btree_iter.c
View file @
fa3ae3ca
...
...
@@ -131,7 +131,7 @@ void bch2_btree_node_unlock_write(struct btree_trans *trans,
bch2_btree_node_unlock_write_inlined
(
trans
,
path
,
b
);
}
st
atic
struct
six_lock_count
btree_node_lock_counts
(
struct
btree_trans
*
trans
,
st
ruct
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
=
b
ch2_b
tree_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
),
b
ch2_b
tree_node_lock_counts
(
trans
,
NULL
,
b
,
level
),
six_lock_counts
(
&
b
->
c
.
lock
));
return
false
;
success:
...
...
This diff is collapsed.
Click to expand it.
fs/bcachefs/trace.c
View file @
fa3ae3ca
...
...
@@ -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"
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment