Address CR comments

Author: cffls

core/txpool/locals/journal.go

@@ -57,6 +57,12 @@ func newTxJournal(path string) *journal {
 	}
 }
 
+func (journal *journal) setWriter(w io.WriteCloser) {
+	journal.mu.Lock()
+	defer journal.mu.Unlock()
+	journal.writer = w
+}
+
 // load parses a transaction journal dump from disk, loading its contents into
 // the specified pool.
 func (journal *journal) load(add func([]*types.Transaction) []error) error {
@@ -74,8 +80,8 @@ func (journal *journal) load(add func([]*types.Transaction) []error) error {
 	defer input.Close()
 
 	// Temporarily discard any journal additions (don't double add on load)
-	journal.writer = new(devNull)
-	defer func() { journal.writer = nil }()
+	journal.setWriter(new(devNull))
+	defer journal.setWriter(nil)
 
 	// Inject all transactions from the journal into the pool
 	stream := rlp.NewStream(input, 0)

triedb/database.go

@@ -85,10 +85,10 @@ type backend interface {
 // relevant with trie nodes and node preimages.
 type Database struct {
 	disk        ethdb.Database
-	config      *Config        // Configuration for trie database
-	preimages   *preimageStore // The store for caching preimages
-	backend     backend        // The backend for managing trie nodes
-	readBackend atomic.Value   // Stores backend interface, lock-free for concurrent reads
+	config      *Config                 // Configuration for trie database
+	preimages   *preimageStore          // The store for caching preimages
+	backend     backend                 // The backend for managing trie nodes
+	readBackend atomic.Pointer[backend] // Lock-free for concurrent reads, supports nil
 }
 
 // NewDatabase initializes the trie database with default settings, note
@@ -119,14 +119,14 @@ func NewDatabase(diskdb ethdb.Database, config *Config) *Database {
 }
 
 func (db *Database) SetReadBackend(b backend) {
-	db.readBackend.Store(b)
+	db.readBackend.Store(&b)
 }
 
 // Reader returns a reader for accessing all trie nodes with provided state root.
 // An error will be returned if the requested state is not available.
 func (db *Database) NodeReader(blockRoot common.Hash) (database.NodeReader, error) {
-	if rb := db.readBackend.Load(); rb != nil {
-		return rb.(backend).NodeReader(blockRoot)
+	if rbPtr := db.readBackend.Load(); rbPtr != nil && *rbPtr != nil {
+		return (*rbPtr).NodeReader(blockRoot)
 	}
 	return db.backend.NodeReader(blockRoot)
 }