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
9d11058a
Commit
9d11058a
authored
Nov 27, 2018
by
Kent Overstreet
Committed by
Kent Overstreet
Oct 22, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bcachefs: fix waiting on an open journal entry
Signed-off-by:
Kent Overstreet
<
kent.overstreet@linux.dev
>
parent
d034c09b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
10 deletions
+6
-10
fs/bcachefs/journal.c
fs/bcachefs/journal.c
+6
-10
No files found.
fs/bcachefs/journal.c
View file @
9d11058a
...
...
@@ -461,7 +461,7 @@ u64 bch2_journal_last_unwritten_seq(struct journal *j)
int
bch2_journal_open_seq_async
(
struct
journal
*
j
,
u64
seq
,
struct
closure
*
cl
)
{
struct
bch_fs
*
c
=
container_of
(
j
,
struct
bch_fs
,
journal
);
bool
need_reclaim
=
false
;
int
ret
;
retry:
spin_lock
(
&
j
->
lock
);
...
...
@@ -489,14 +489,11 @@ int bch2_journal_open_seq_async(struct journal *j, u64 seq, struct closure *cl)
BUG_ON
(
journal_cur_seq
(
j
)
<
seq
);
if
(
!
journal_entry_open
(
j
))
{
need_reclaim
=
true
;
goto
blocked
;
ret
=
journal_entry_open
(
j
);
if
(
ret
)
{
spin_unlock
(
&
j
->
lock
);
return
ret
<
0
?
ret
:
0
;
}
spin_unlock
(
&
j
->
lock
);
return
0
;
blocked:
if
(
!
j
->
res_get_blocked_start
)
j
->
res_get_blocked_start
=
local_clock
()
?:
1
;
...
...
@@ -504,8 +501,7 @@ int bch2_journal_open_seq_async(struct journal *j, u64 seq, struct closure *cl)
closure_wait
(
&
j
->
async_wait
,
cl
);
spin_unlock
(
&
j
->
lock
);
if
(
need_reclaim
)
bch2_journal_reclaim_work
(
&
j
->
reclaim_work
.
work
);
bch2_journal_reclaim_work
(
&
j
->
reclaim_work
.
work
);
return
-
EAGAIN
;
}
...
...
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