From 6bc82bb4e6355efe8addba40cbed03467a9c7f67 Mon Sep 17 00:00:00 2001
From: Derek Collison <derek@nats.io>
Date: Tue, 9 Aug 2022 17:42:02 -0500
Subject: [PATCH] Fic a data race

Signed-off-by: Derek Collison <derek@nats.io>
---
 server/filestore.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/filestore.go b/server/filestore.go
index 52f9b32e..21ee18f1 100644
--- a/server/filestore.go
+++ b/server/filestore.go
@@ -5016,7 +5016,10 @@ func (mb *msgBlock) ensurePerSubjectInfoLoaded() error {
 
 // Called on recovery to populate the global psim state.
 func (fs *fileStore) populateGlobalPerSubjectInfo(mb *msgBlock) {
-	if err := mb.readPerSubjectInfo(false); err != nil {
+	mb.mu.Lock()
+	defer mb.mu.Unlock()
+
+	if err := mb.readPerSubjectInfo(true); err != nil {
 		return
 	}
 	// Now populate psim.