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
56e0e7c7
Commit
56e0e7c7
authored
6 years ago
by
Kent Overstreet
Committed by
Kent Overstreet
1 year ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bcachefs: fix an incorrect bkey_debugcheck() call
Signed-off-by:
Kent Overstreet
<
kent.overstreet@linux.dev
>
parent
45dbb73e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
1 deletion
+17
-1
fs/bcachefs/btree_iter.c
fs/bcachefs/btree_iter.c
+17
-1
No files found.
fs/bcachefs/btree_iter.c
View file @
56e0e7c7
...
...
@@ -531,8 +531,24 @@ static void __bch2_btree_node_iter_fix(struct btree_iter *iter,
btree_iter_set_dirty
(
iter
,
BTREE_ITER_NEED_PEEK
);
bch2_btree_node_iter_sort
(
node_iter
,
b
);
if
(
!
b
->
level
&&
node_iter
==
&
iter
->
l
[
0
].
iter
)
if
(
!
b
->
level
&&
node_iter
==
&
iter
->
l
[
0
].
iter
)
{
/*
* not legal to call bkey_debugcheck() here, because we're
* called midway through the update path after update has been
* marked but before deletes have actually happened:
*/
#if 0
__btree_iter_peek_all(iter, &iter->l[0], &iter->k);
#endif
struct
btree_iter_level
*
l
=
&
iter
->
l
[
0
];
struct
bkey_packed
*
k
=
bch2_btree_node_iter_peek_all
(
&
l
->
iter
,
l
->
b
);
if
(
unlikely
(
!
k
))
iter
->
k
.
type
=
KEY_TYPE_deleted
;
else
bkey_disassemble
(
l
->
b
,
k
,
&
iter
->
k
);
}
iter_current_key_not_modified:
/*
...
...
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