Skip to content

bcachefs: use SRCU-aware waits after dropping locks #710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Komzpa wants to merge 1 commit into from
Closed

bcachefs: use SRCU-aware waits after dropping locks #710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fs/btree/commit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1320,7 +1320,7 @@ static noinline int bch2_trans_commit_btree_write_ratelimit(struct btree_trans *
struct bch_fs_btree_cache *bc = &c->btree.cache;

return drop_locks_do(trans, ({
closure_wait_event(&bc->nr_in_flight_wait,
trans_wait_event(trans, &bc->nr_in_flight_wait,
atomic_long_read(&bc->nr_in_flight_inner) < BTREE_WRITE_IO_LIMIT(c) * 3 / 4 &&
!bch2_btree_cache_should_throttle(c));
0;
Expand Down
4 changes: 2 additions & 2 deletions fs/btree/interior.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1435,8 +1435,8 @@ bch2_btree_update_start(struct btree_trans *trans, struct btree_path *path,
return ERR_PTR(-BCH_ERR_journal_reclaim_would_deadlock);

ret = drop_locks_do(trans,
({ closure_wait_event(&c->journal.async_wait,
!journal_low_on_space(&c->journal)); 0; }));
({ trans_wait_event(trans, &c->journal.async_wait,
!journal_low_on_space(&c->journal)); 0; }));
if (ret)
return ERR_PTR(ret);
}
Expand Down
Loading