Reduce cs_main lock in ReadBlockFromDisk, only read GetBlockPos under

jonasschnelli · random-zebra · commit f773203f2c68 · 2021-04-11T11:33:46.000+02:00
the lock
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -820,8 +820,10 @@ bool ReadBlockFromDisk(CBlock& block, const CDiskBlockPos& pos)
 
 bool ReadBlockFromDisk(CBlock& block, const CBlockIndex* pindex)
 {
-    if (!ReadBlockFromDisk(block, pindex->GetBlockPos()))
+    CDiskBlockPos blockPos = WITH_LOCK(cs_main, return pindex->GetBlockPos(); );
+    if (!ReadBlockFromDisk(block, blockPos)) {
         return false;
+    }
     if (block.GetHash() != pindex->GetBlockHash()) {
         LogPrintf("%s : block=%s index=%s\n", __func__, block.GetHash().GetHex(), pindex->GetBlockHash().GetHex());
         return error("ReadBlockFromDisk(CBlock&, CBlockIndex*) : GetHash() doesn't match index");
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1905,8 +1905,7 @@ CBlockIndex* CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, CBlock
             }
 
             CBlock block;
-            bool readRet = WITH_LOCK(cs_main, return ReadBlockFromDisk(block, pindex); );
-            if (readRet) {
+            if (ReadBlockFromDisk(block, pindex)) {
                 LOCK2(cs_main, cs_wallet);
                 if (pindex && !chainActive.Contains(pindex)) {
                      // Abort scan if current block is no longer active, to prevent

Original file line number	Diff line number	Diff line change
`@@ -1905,8 +1905,7 @@ CBlockIndex* CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, CBlock`
`1905`	`1905`	`}`
`1906`	`1906`
`1907`	`1907`	`CBlock block;`
`1908`		`- bool readRet = WITH_LOCK(cs_main, return ReadBlockFromDisk(block, pindex); );`
`1909`		`- if (readRet) {`
	`1908`	`+ if (ReadBlockFromDisk(block, pindex)) {`
`1910`	`1909`	`LOCK2(cs_main, cs_wallet);`
`1911`	`1910`	`if (pindex && !chainActive.Contains(pindex)) {`
`1912`	`1911`	`// Abort scan if current block is no longer active, to prevent`