snapshot: upgrade lock usage#30001

karalabe merged 2 commits intoethereum:masterethereum/go-ethereum:masterfrom

mask-pp:lock_fixmask-pp/go-ethereum:lock_fixCopy head branch name to clipboard