Commit 2b47102b authored by Kent Overstreet's avatar Kent Overstreet
Browse files

bcachefs: Reorder error messages that include journal debug 



Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent 393a05a7

fs/bcachefs/journal.c

+5 −5
Original line number Diff line number Diff line
@@ -168,11 +168,11 @@ journal_error_check_stuck(struct journal *j, int error, unsigned flags) 
		return stuck;

	}

	j->err_seq = journal_cur_seq(j);

	spin_unlock(&j->lock);



	bch_err(c, "Journal stuck! Hava a pre-reservation but journal full (error %s)",

	__bch2_journal_debug_to_text(&buf, j);

	spin_unlock(&j->lock);

	prt_printf(&buf, bch2_fmt(c, "Journal stuck! Hava a pre-reservation but journal full (error %s)"),

				  bch2_err_str(error));

	bch2_journal_debug_to_text(&buf, j);

	bch2_print_string_as_lines(KERN_ERR, buf.buf);



	printbuf_reset(&buf);
@@ -727,10 +727,10 @@ int bch2_journal_res_get_slowpath(struct journal *j, struct journal_res *res, 
		   remaining_wait))

		return ret;



	bch_err(c, "Journal stuck? Waited for 10 seconds, err %s", bch2_err_str(ret));

	struct printbuf buf = PRINTBUF;

	bch2_journal_debug_to_text(&buf, j);

	bch2_print_string_as_lines(KERN_ERR, buf.buf);

	prt_printf(&buf, bch2_fmt(c, "Journal stuck? Waited for 10 seconds, err %s"), bch2_err_str(ret));

	printbuf_exit(&buf);



	closure_wait_event(&j->async_wait,

fs/bcachefs/journal_io.c

+2 −2
Original line number Diff line number Diff line
@@ -2082,12 +2082,12 @@ CLOSURE_CALLBACK(bch2_journal_write) 
		struct printbuf buf = PRINTBUF;

		buf.atomic++;



		__bch2_journal_debug_to_text(&buf, j);

		spin_unlock(&j->lock);

		prt_printf(&buf, bch2_fmt(c, "Unable to allocate journal write at seq %llu for %zu sectors: %s"),

					  le64_to_cpu(w->data->seq),

					  vstruct_sectors(w->data, c->block_bits),

					  bch2_err_str(ret));

		__bch2_journal_debug_to_text(&buf, j);

		spin_unlock(&j->lock);

		bch2_print_string_as_lines(KERN_ERR, buf.buf);

		printbuf_exit(&buf);

	}