mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-15 15:15:47 +00:00
Code Issues Releases Wiki Activity

bcachefs: fix waiting on an open journal entry

Browse source 
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2018-11-27 10:06:18 -05:00 committed by Kent Overstreet
parent d034c09b26
commit 9d11058a78
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
fs/bcachefs/journal.c
View file

@ -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;
}