This is a bug fix for overlooks in this same series of commits. I
won't fix each lock when it is introduced before proposing for master,
because it takes too much time.

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
Acked-by: Federico Vaga <federico.vaga@gmail.com>