Convert a semaphore to a mutex in locking.c and also tidy
up one or two loose ends.
Signed-off-by: NSteven Whitehouse <swhiteho@redhat.com>