It's not really that change that bothers me here, it's that I don't see how adding more locks makes anything actually behave differently.
Adding them maybe fixes the hang just because it changes the scheduling, it doesn't prevent it from happening, and it isn't the right way to fix this issue, we need to understand what is causing the hang in the first place.