mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-05 19:24:01 -04:00
bcachefs: Change journal_io.c assertion to error message
Something funny is going on with the new code for restoring the journal write point, and it's hard to reproduce. We do want to debug this because resuming writing to the journal in the wrong spot could be something serious. For now, replace the assertion with an error message and revert to old behaviour when it happens. Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
This commit is contained in:
committed by
Kent Overstreet
parent
7a6f4411ae
commit
b0be2fcfb4
@@ -964,8 +964,16 @@ static void bch2_journal_read_device(struct closure *cl)
|
||||
}
|
||||
mutex_unlock(&jlist->lock);
|
||||
|
||||
BUG_ON(ja->bucket_seq[ja->cur_idx] &&
|
||||
ja->sectors_free == ca->mi.bucket_size);
|
||||
if (ja->bucket_seq[ja->cur_idx] &&
|
||||
ja->sectors_free == ca->mi.bucket_size) {
|
||||
bch_err(c, "ja->sectors_free == ca->mi.bucket_size");
|
||||
bch_err(c, "cur_idx %u/%u", ja->cur_idx, ja->nr);
|
||||
for (i = 0; i < 3; i++) {
|
||||
unsigned idx = (ja->cur_idx + ja->nr - 1 + i) % ja->nr;
|
||||
bch_err(c, "bucket_seq[%u] = %llu", idx, ja->bucket_seq[idx]);
|
||||
}
|
||||
ja->sectors_free = 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Set dirty_idx to indicate the entire journal is full and needs to be
|
||||
|
||||
Reference in New Issue
Block a user