Commit 9be1efe9 authored by Kent Overstreet's avatar Kent Overstreet Committed by Kent Overstreet

bcachefs: Fix error reporting from bch2_journal_flush_seq

- bch2_journal_halt() was unconditionally overwriting j->err_seq, the
  sequence number that we failed to write
- journal_write_done was updating seq_ondisk and flushed_seq_ondisk even
  for writes that errored, which broke the way bch2_journal_flush_seq_async()
  locklessly checked for completions.
Signed-off-by: default avatarKent Overstreet <kent.overstreet@gmail.com>
parent f0c3f88b
...@@ -106,7 +106,12 @@ void bch2_journal_halt(struct journal *j) ...@@ -106,7 +106,12 @@ void bch2_journal_halt(struct journal *j)
} while ((v = atomic64_cmpxchg(&j->reservations.counter, } while ((v = atomic64_cmpxchg(&j->reservations.counter,
old.v, new.v)) != old.v); old.v, new.v)) != old.v);
j->err_seq = journal_cur_seq(j); /*
* XXX: we're not using j->lock here because this can be called from
* interrupt context, this can race with journal_write_done()
*/
if (!j->err_seq)
j->err_seq = journal_cur_seq(j);
journal_wake(j); journal_wake(j);
closure_wake_up(&journal_cur_buf(j)->wait); closure_wake_up(&journal_cur_buf(j)->wait);
} }
......
...@@ -1258,14 +1258,15 @@ static void journal_write_done(struct closure *cl) ...@@ -1258,14 +1258,15 @@ static void journal_write_done(struct closure *cl)
if (seq >= j->pin.front) if (seq >= j->pin.front)
journal_seq_pin(j, seq)->devs = w->devs_written; journal_seq_pin(j, seq)->devs = w->devs_written;
j->seq_ondisk = seq; if (!err) {
if (err && (!j->err_seq || seq < j->err_seq)) j->seq_ondisk = seq;
j->err_seq = seq;
if (!JSET_NO_FLUSH(w->data)) { if (!JSET_NO_FLUSH(w->data)) {
j->flushed_seq_ondisk = seq; j->flushed_seq_ondisk = seq;
j->last_seq_ondisk = w->last_seq; j->last_seq_ondisk = w->last_seq;
} }
} else if (!j->err_seq || seq < j->err_seq)
j->err_seq = seq;
/* /*
* Updating last_seq_ondisk may let bch2_journal_reclaim_work() discard * Updating last_seq_ondisk may let bch2_journal_reclaim_work() discard
......
...@@ -1480,7 +1480,7 @@ int bch2_fs_initialize(struct bch_fs *c) ...@@ -1480,7 +1480,7 @@ int bch2_fs_initialize(struct bch_fs *c)
} }
err = "error writing first journal entry"; err = "error writing first journal entry";
ret = bch2_journal_meta(&c->journal); ret = bch2_journal_flush(&c->journal);
if (ret) if (ret)
goto err; goto err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment