From f89eb5a2884d3afde05ee2cad83a813f4ea5cfb9 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Mon, 11 Apr 2022 23:03:41 -0400 Subject: [PATCH] Update bcachefs sources to de2fbf8b87 fixup! bcachefs: Change journal_io.c assertion to error message --- .bcachefs_revision | 2 +- libbcachefs/journal_io.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.bcachefs_revision b/.bcachefs_revision index 7e508a09..14d539bb 100644 --- a/.bcachefs_revision +++ b/.bcachefs_revision @@ -1 +1 @@ -fb8a27f6d45d869450c676e743cff4b03bb713ba +de2fbf8b875fd8e61cc9a583d073f5527e3cb8e7 diff --git a/libbcachefs/journal_io.c b/libbcachefs/journal_io.c index 6456e8b8..7c0aed9d 100644 --- a/libbcachefs/journal_io.c +++ b/libbcachefs/journal_io.c @@ -989,7 +989,7 @@ static void bch2_journal_read_device(struct closure *cl) 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 - 1 + 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;