X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libbcachefs%2Fjournal_io.c;h=b455ef041dfefd6b6ab1c7bae0608406d2decba9;hb=5ef62f56ab50c5799f713e3a42f5c7ad7e8283d3;hp=ede9d198bb85186d60c68dbc0406d5ae568d892f;hpb=c08971632cf3133545259ec5fa008201ca169582;p=bcachefs-tools-debian

diff --git a/libbcachefs/journal_io.c b/libbcachefs/journal_io.c
index ede9d19..b455ef0 100644
--- a/libbcachefs/journal_io.c
+++ b/libbcachefs/journal_io.c
@@ -1743,7 +1743,16 @@ void bch2_journal_write(struct closure *cl)
 	BUG_ON(u64s > j->entry_u64s_reserved);
 
 	le32_add_cpu(&jset->u64s, u64s);
-	BUG_ON(vstruct_sectors(jset, c->block_bits) > w->sectors);
+
+	sectors = vstruct_sectors(jset, c->block_bits);
+	bytes	= vstruct_bytes(jset);
+
+	if (sectors > w->sectors) {
+		bch2_fs_fatal_error(c, "aieeee! journal write overran available space, %zu > %u (extra %u reserved %u/%u)",
+				    vstruct_bytes(jset), w->sectors << 9,
+				    u64s, w->u64s_reserved, j->entry_u64s_reserved);
+		goto err;
+	}
 
 	jset->magic		= cpu_to_le64(jset_magic(c));
 	jset->version		= c->sb.version < bcachefs_metadata_version_bkey_renumber
@@ -1780,10 +1789,6 @@ void bch2_journal_write(struct closure *cl)
 	    jset_validate(c, NULL, jset, 0, WRITE))
 		goto err;
 
-	sectors = vstruct_sectors(jset, c->block_bits);
-	BUG_ON(sectors > w->sectors);
-
-	bytes = vstruct_bytes(jset);
 	memset((void *) jset + bytes, 0, (sectors << 9) - bytes);
 
 retry_alloc: