summaryrefslogtreecommitdiff
path: root/libbcachefs/journal.c
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2020-12-03 13:07:16 -0500
committerKent Overstreet <kent.overstreet@gmail.com>2020-12-03 13:13:53 -0500
commitdd707c9bfdc13fd90856576ddbb383efccef751c (patch)
treea0d588354c6281cf05d490b30ebbeafc9064dea1 /libbcachefs/journal.c
parent1e574cb1aa07ab3a796c7d6c5501b96f3056ef4d (diff)
Update bcachefs sources to 0010403265 bcachefs: Fix spurious alloc errors on forced shutdown
Diffstat (limited to 'libbcachefs/journal.c')
-rw-r--r--libbcachefs/journal.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/libbcachefs/journal.c b/libbcachefs/journal.c
index 5874a9ff..dd8db8c0 100644
--- a/libbcachefs/journal.c
+++ b/libbcachefs/journal.c
@@ -553,16 +553,13 @@ int bch2_journal_flush_seq_async(struct journal *j, u64 seq,
struct journal_buf *buf;
int ret = 0;
- if (seq <= j->err_seq)
- return -EIO;
-
if (seq <= j->seq_ondisk)
return 1;
spin_lock(&j->lock);
/* Recheck under lock: */
- if (seq <= j->err_seq) {
+ if (j->err_seq && seq >= j->err_seq) {
ret = -EIO;
goto out;
}