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
37dd7834
Commit
37dd7834
authored
5 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 error path in bch2_btree_iter_traverse()
Signed-off-by:
Kent Overstreet
<
kent.overstreet@linux.dev
>
parent
6e738539
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
fs/bcachefs/btree_iter.c
fs/bcachefs/btree_iter.c
+4
-3
No files found.
fs/bcachefs/btree_iter.c
View file @
37dd7834
...
@@ -959,9 +959,10 @@ static void btree_iter_up(struct btree_iter *iter)
...
@@ -959,9 +959,10 @@ static void btree_iter_up(struct btree_iter *iter)
int
__must_check
__bch2_btree_iter_traverse
(
struct
btree_iter
*
);
int
__must_check
__bch2_btree_iter_traverse
(
struct
btree_iter
*
);
static
int
__btree_iter_traverse_all
(
struct
btree_trans
*
trans
,
static
int
__btree_iter_traverse_all
(
struct
btree_trans
*
trans
,
struct
btree_iter
*
iter
,
int
ret
)
struct
btree_iter
*
orig_
iter
,
int
ret
)
{
{
struct
bch_fs
*
c
=
trans
->
c
;
struct
bch_fs
*
c
=
trans
->
c
;
struct
btree_iter
*
iter
;
u8
sorted
[
BTREE_ITER_MAX
];
u8
sorted
[
BTREE_ITER_MAX
];
unsigned
i
,
nr_sorted
=
0
;
unsigned
i
,
nr_sorted
=
0
;
...
@@ -990,8 +991,8 @@ static int __btree_iter_traverse_all(struct btree_trans *trans,
...
@@ -990,8 +991,8 @@ static int __btree_iter_traverse_all(struct btree_trans *trans,
if
(
unlikely
(
ret
==
-
EIO
))
{
if
(
unlikely
(
ret
==
-
EIO
))
{
trans
->
error
=
true
;
trans
->
error
=
true
;
iter
->
flags
|=
BTREE_ITER_ERROR
;
orig_
iter
->
flags
|=
BTREE_ITER_ERROR
;
iter
->
l
[
iter
->
level
].
b
=
BTREE_ITER_NO_NODE_ERROR
;
orig_iter
->
l
[
orig_
iter
->
level
].
b
=
BTREE_ITER_NO_NODE_ERROR
;
goto
out
;
goto
out
;
}
}
...
...
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