summaryrefslogtreecommitdiff
path: root/libbcachefs/journal_reclaim.c
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@linux.dev>2023-03-31 15:52:24 -0400
committerKent Overstreet <kent.overstreet@linux.dev>2023-03-31 18:02:57 -0400
commit7f102ee83d83fd918783ca542fac1574f9b2c623 (patch)
treeda560f908d970d3dbad5749c1407ed30b6965c4c /libbcachefs/journal_reclaim.c
parentd22c79d2fff10dd782caf5668fd019387914a5bb (diff)
Update bcachefs sources to 8fd009dd76 bcachefs: Rip out code for storing backpointers in alloc keysv0.28
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'libbcachefs/journal_reclaim.c')
-rw-r--r--libbcachefs/journal_reclaim.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/libbcachefs/journal_reclaim.c b/libbcachefs/journal_reclaim.c
index 8c88884c..37c6846a 100644
--- a/libbcachefs/journal_reclaim.c
+++ b/libbcachefs/journal_reclaim.c
@@ -210,24 +210,7 @@ void bch2_journal_space_available(struct journal *j)
clean = j->space[journal_space_clean].total;
total = j->space[journal_space_total].total;
- if (!clean_ondisk &&
- journal_cur_seq(j) == j->seq_ondisk) {
- struct printbuf buf = PRINTBUF;
-
- __bch2_journal_debug_to_text(&buf, j);
- bch_err(c, "journal stuck\n%s", buf.buf);
- printbuf_exit(&buf);
-
- /*
- * Hack: bch2_fatal_error() calls bch2_journal_halt() which
- * takes journal lock:
- */
- spin_unlock(&j->lock);
- bch2_fatal_error(c);
- spin_lock(&j->lock);
-
- ret = JOURNAL_ERR_journal_stuck;
- } else if (!j->space[journal_space_discarded].next_entry)
+ if (!j->space[journal_space_discarded].next_entry)
ret = JOURNAL_ERR_journal_full;
if ((j->space[journal_space_clean_ondisk].next_entry <