Reduce the number of spinlocks around and play safe Signed-off-by: Federico Vaga <federico.vaga@cern.ch>