lock the getter instead ??? c/o M

src/service/rooms/event_handler/upgrade_outlier_pdu.rs

@@ -141,7 +141,7 @@ pub(super) async fn upgrade_outlier_to_timeline_pdu(
 	let extremities: Vec<_> = self
 		.services
 		.state
-		.get_forward_extremities(room_id)
+		.get_forward_extremities(room_id, &state_lock)
 		.map(ToOwned::to_owned)
 		.ready_filter(|event_id| {
 			// Remove any that are referenced by this incoming event's prev_events

src/service/rooms/state/mod.rs

@@ -384,6 +384,7 @@ impl Service {
 	pub fn get_forward_extremities<'a>(
 		&'a self,
 		room_id: &'a RoomId,
+		_state_lock: &'a RoomMutexGuard,
 	) -> impl Stream<Item = &EventId> + Send + '_ {
 		let prefix = (room_id, Interfix);
 

src/service/rooms/timeline/mod.rs

@@ -654,7 +654,7 @@ impl Service {
 		let prev_events: Vec<OwnedEventId> = self
 			.services
 			.state
-			.get_forward_extremities(room_id)
+			.get_forward_extremities(room_id, _mutex_lock)
 			.take(20)
 			.map(Into::into)
 			.collect()