bcachefs: move journal seq assertion

Kent Overstreet · Kent Overstreet · commit ef0beeb8dd34 · 2023-11-28T22:58:22.000-05:00
journal_cur_seq() can legitimately be used outside of the journal lock,
where this assert can race

Signed-off-by: Kent Overstreet &lt;kent.overstreet@linux.dev&gt;
diff --git a/fs/bcachefs/journal.c b/fs/bcachefs/journal.c
@@ -321,6 +321,8 @@ static int journal_entry_open(struct journal *j)
 	atomic64_inc(&j->seq);
 	journal_pin_list_init(fifo_push_ref(&j->pin), 1);
 
+	BUG_ON(j->pin.back - 1 != atomic64_read(&j->seq));
+
 	BUG_ON(j->buf + (journal_cur_seq(j) & JOURNAL_BUF_MASK) != buf);
 
 	bkey_extent_init(&buf->key);
diff --git a/fs/bcachefs/journal.h b/fs/bcachefs/journal.h
@@ -136,9 +136,7 @@ static inline u64 journal_last_seq(struct journal *j)
 
 static inline u64 journal_cur_seq(struct journal *j)
 {
-	EBUG_ON(j->pin.back - 1 != atomic64_read(&j->seq));
-
-	return j->pin.back - 1;
+	return atomic64_read(&j->seq);
 }
 
 static inline u64 journal_last_unwritten_seq(struct journal *j)

Original file line number	Diff line number	Diff line change
`@@ -136,9 +136,7 @@ static inline u64 journal_last_seq(struct journal *j)`
`136`	`136`
`137`	`137`	`static inline u64 journal_cur_seq(struct journal *j)`
`138`	`138`	`{`
`139`		`- EBUG_ON(j->pin.back - 1 != atomic64_read(&j->seq));`
`140`		`-`
`141`		`- return j->pin.back - 1;`
	`139`	`+ return atomic64_read(&j->seq);`
`142`	`140`	`}`
`143`	`141`
`144`	`142`	`static inline u64 journal_last_unwritten_seq(struct journal *j)`